spring clean up 3

update