Adding desc, cleaning up code