Bracket, conventions refactoring