More clean and fast