Formatting update

Fixed some formatting throughout for a cleaner look.