Improved formatter load time. Rest: Refactoring