Refactored usings, naming conventions, and squelched some warnings.