Cleaned up

Did a lot of cleaning and improvements