Clean Java indentation and imports