refactor of spaces and indentation