copyright and code style fixes