Correct couple of import paths, add right indentation