Code cleanup

Frontend bracket clean up
Code cleanup

Backend bracket clean up