Some general cleanup, mostly comments cleanup