chore(style) clean up warnings

Closes $564