Code clean-up, adjust version number