Cleaning up some code mess
Cleaning up some code mess