More comments, remove unneeded overloading