Refactoring

Refactoring added

Related to issue karlitrotski/CodingSpectator/#12
Pair Programming with @karlitrotski