Improve code layout
Rename overflow to crop