Cleaning up imports, updating comments