cleaned up comments etc