Fixed comment and other simplification.
Renamed package to distribution.