Shorter intro
module/class
Minor improvements