Change order of imports
Fix typo
Replace lambda with operator

Refactor FTW