spring cleaning
more spring cleanup