Clean a little the code