Update description; make code smaller