Remove unneeded trailing whitespace from headers; do not use __ affixes in headers; add property for builder level
Ignore args till needed