Cleaned up spacing and extra lines