Refactor Logic with new class methods