Version bump; Refactor forms; pep8