Lil' refactoring
Lil' styling