Comments and removed extra func