Simplify a bit this code