more whitespace code tweaks for readability