Code cleanup

Backend bracket clean up