Fixed some codestyle issues