Touch up copyright header and a few code style details