General clean up
Cleaning up