Better function names
Wrap some long lines