Clean code, and add two plugins