Fiixed remaining stylistic issues