minor cleanup in code