More refactoring, moved around constants