Just refactoring a very small amount