minor modifications for cleanup