Spring clean up 10