Changed some defs with no parameters into vals or lazy vals