Tidy up code style all over the place
Try to keep filename intact for dropped images