Refactoring and cosmetics chantes