forked from External/greenlight
a6ce974b88
tidy up code based on CR Co-authored-by: Rangga Permana <ranggapermana@catalyst.net.nz>