Tidy up code.
Tidy up code.

nowells/smokestack,kemitchell/smokestack,nolanlawson/smokestack,mattdesl/smokestack,nolanlawson/smokestack,patrickkettner/smokestack,patrickkettner/smokestack,kemitchell/smokestack,mattdesl/smokestack,nowells/smokestack