:golf: code cleanup, good call @abhiyerra