FIX for issue 938, cleanup with 80 line length max