mini-push: code cleanup