Standardized Code, cleaned imports and fixed some identation in code