removed extra imports and managed whitespace
cleaned up