Fixed some codingstyle issues