Refactoring & cosmetic stuff