Clean up some code
Clean up some code