removed extra self statements