Refactor

[JanOppolzer]

This messy code just need some refactoring as it's getting a pain to maintain it or add new features.

[dhdutoit]

Hi @JanOppolzer , do you still need some help with this open issue?

[JanOppolzer]

Hi @dhdutoit , feel free to send pull requests for any part you will improve. I'm going to focus on this in the following days and weeks.