multiple clean ups; automapper preconfigured to suppost two way binding