removed extra lines of code