Cleans things up: puts functions in same order as features list, separate functions with a newline, new section headings