Organized some imports, fixed some warnings.