cleaned up hte pis scaffold