Code cleaning.

There were two classes duplicated.
Related to issue karlitrotski/CodingSpectator/#35.
Pair programming with @cinai.