cleaned up some style issues (lint still complains about naming, but at least it's consistent)