minor formatting fixes: removed trailing spaces, replaced spaces with
tabs, etc