Removed reduntant code
Comments & cleanup