Cleaning up my code to be more consistent.