Refactoring and exeception handling clean up.