removed print lines and commented code