More clean solution