refactor: consistent order of handling configurable params
cosmetic: reduce vertical space and distance to default