Cosmetic love, refactors etc.