Code clean up

As it is the codebase is a little bit messy. Some simple clean up could ease the reading...