OA-251: code cleanup.
OA-251: code cleanup.

archoo/twfy,archoo/twfy,openaustralia/twfy,openaustralia/twfy,archoo/twfy,openaustralia/twfy,archoo/twfy,openaustralia/twfy,archoo/twfy,archoo/twfy,openaustralia/twfy,openaustralia/twfy,archoo/twfy