Refactoring and adding handling for SUB