Some cleanup and parse-current-branch fix
Add some structure goodness