Fix indentation and max line-length issues