Removed pointless <0 checks