removed commented code and extra Ps