Some indentation & renaming