controller cleanup
begin migrating out string consts to module