some minor refactoring
split branch and version info