* Cleaned up formatting