#116: Tidy-up codenarc + trailing space removal