Clean up
Clean up
Clean up and minor fixes