master: code cleanup