Remove comments. Fix some codestyle issues