Complete scala import sorting
Fix dangling newline