decreased some indentation levels
misc linting