simplify
small cleanup