Fix switch statements and cleanup code

[talarian1]

• All tests passed. If this feature is not already covered by the tests, I added new tests.
• All static analysis checks passed.
• This pull request is on the dev branch.
• I used gofmt for formatting the code before submitting the pull request.

---

This PR introduces the following changes:

1. Fixes a minor bug regarding gradle cases in some switch cases. (The go default switch behavior is not to fall through cases. To achieve that, the ',' notation or the keywords fallthrough is necessary)
2. Replace the fallthrough with the ',' notation for better readability .
3. Remove the filterColor that I believe was not used.