Resolved conflict
Cleanup
Comments changed