Improvements and refactor

a complete refactor of every class that code_climate complains about.

we have 1 repetition, but I think it's enough for now.