Fixing formatting, making it easier to track what's going on