Slight cleanup on imports