Cleaned up the formatting