Cleaning up my changes a bit