Update description, clean-up some code