Clean up short variable names.

Need to work with new nofw DI
Moving exception handling to separate file.