FIX for issue 915, cleanup with 80 line length max