Code refactor

I've been working on the project's GitHub page -basically DOING it- and
took the chance to refactor code a little bit.