Fixed some whitespaces and codingstyle issues