Clean up some style/lint errors