Code cleanup, added version constant.