Simplify more logic