Add a few comments and shorten imports