Some Code style fixes