Minor code clean up; Added min version