small cleanup in code