Misc refactor + version increment