Removed debug info and added comments