[#192] Code cleanup

Cutting overly long lines and some other small cleanup actions