style: clean up some verbose code