Cleaned up code
Merge comment changes + cleaned up code