removed extra lines, commented code