REFACTOR: Removed redundancy