Comments are still messy, clean up and fix adding / removing them