Refactor, refactor, refactor
More refactoring, better forms