Fixed typos, mixing comments and removed unused method