Cleaned up comments etc