Cleaned up formating and spacing