Made it less "clumsy"