Cleaned up comments in source