Fixing names and indentation