address review comments - commit will be squashed

- fix white space
- remove unnecessary casts