Standardized Code and cleaned up imports.