Clean up and added Comments