Little refactor for consistency sake