Cleaned up import and comment