Cleaning up code before final commit