Removed assert, added comments