Improved function names, restructured