Add description, clean up some code