Fix "stupid" code

From now on, I'm rewriting code as it comes along
Closes #168