Removed user name and added comments