Cleaned up initial import