Simplifications
Improve naming
Improve comments
Improve method naming