fixed @iguananut's suggestions