Reviewing all code to push to final branch