Update to description, general cleanup, added comments