Refactored the formatting setup to be slightly cleaner