FIX: Completed refactor