File: simplify a little the code