whitespace fixes

vim settings:
expandtab softtabstop=4 shiftwidth=4 ts=8