Clean up clipboard code and remove top level dashes