Cleanup
Improve method references
Some utils