renamed for consistency.
revert: renamed for consistency.
reindent + STYLE fixes.