Slight refactoring of formatters, added base specs