Minor code clean-up; bumped version number