chore (all) clean up code to get lint happy