whitespace fixes (tabs 2 spaces and removed trailing whitespace)