Added two good methods to list
Clean up imports project-wide