indentation and fixes