Code style fixes in progress