beautify indentation
beautify indentation + cleaning up