Improves formatting system, tests