Added in automapper map and some house cleaning