Spring clean up Revised 2017