Improved comments and updated to import (...)