Code optimization.
Related to issue karlitrotski/CodingSpectator/#13
Pair programming with @sesanchez