Cleaning up some code issues