Mostly codestyle changes. Also comment autocomplete removal fixed.