revert wrong indentation
remove empty newlines
fix scaladoc indentation
reorder renamed imports