Tweak code style.
Fix builder pattern.