refactor: Simplifying... lots