Refactored Formatter and started with a better layout.