Remove not needed pass
Better variable names