Tidy all answer code