Cleaning up code for contributors