more readable whitespace
add WRAPPER_CLASS and USE_HR options