Cleaned up and fixed formatting