Removed unecessary comments and
fixed dummy logic