improved more whitespace formatting