HW3: Clean-up

Minor clean-up to be consistent code-wise