image upload cleaned up a bit