Fix case
Use UFCS
Fix whitespace