Mostly cosmetic + smal refactoring