style cleanup and lint fixes

Simple lint fixes and style cleanup