Finish image upload and AWS logic
code cleanup