Now is cleaner than before solution