Cleaned up comments in code