Closes 9: Also code refactoring and removed saving to a file in Camera Activity