Refer to proper version.
Some basic cleaning up.