- remove some unnecessary casts and braces;