some codingstyle changes