Cleaned up imports and refactored static methods.