Removed edit option, added comments