Reorder methods to make a little more sense
Split off image_path to separate class