Final changes to fix style issues for iteration 1