Refactoring code standards