made controllers more dry
more dry; also fixed bug