Fix Bracket Layout And Code Review