Remove duplicated code using .modalController abstraction

Some of the latest code had some duplicates in it. This still needs some refactor but it's cleaner I believe.