Cleanup and add come comments