Updates to make formatting cleaner