Cleaned up comments
Merge