Apply neobrain's suggestions