Just aestetics, mostly refactoring