Moved formatting to it's own package;