Final code style fixes