Format is much cleaner