Cleaned up formatting. Still working on it...