some minimal code cleanup