Small changes before refactoring/renaming