Refactored negative handling and cleaned syntax a bit