Cleaning up some code

Cleaning up some code