Cleaned up format, no functional changes