additional style refactors
Merge branch 'master' of https://github.com/connorbarnett/ThermalRunaway