indentation and renaming stuff