Simplify that code