Cleanup
Cleanup and commented