[WIP] Code Quality

By checking the not yet merged Landscape.io, I thought about helping a bit on the code style and quality.

This is still a work in progress. I'll tell when it's ok to merge