small is master refactor