Apply Yoshi's suggestions