Added Commets and cleaned up files