cleaning up
replace picasso with nostra
minor changes