Fixed helpers and put them in their respective files.