Some cleanup;
Add `boxHeight` support;