Removed unnecessary items and added comments