Cleaning code and fixing gallery.