Still polishing a little the code