Minor cleanup, contributors, tests