Cleanup, Update, and add repaste