master: cleanup coding