Cleaned-up formatting