Removed storage to "thumbnail" key and some cosmetic changes