Cleaning up commit pt. 2