Tweak code style and remove old comments