Incorporate comments + Some cleanup