Removed redlogic, small refactor