whitespace and import cleanup only
small cleanups, typo fix
[nl] rule update by Ruud Baars