Another stupid refactor