Refactor - redundant method, spacing