Fixed comments and removed a method in cell