Milestone fix, formatting