cleaned up code; final keyword, optimized imports, refactored provider classes