Cleaning up code for pull req