Small fix.
Split Data.prepare into smaller methods.