whitespace & minor formatting