Improve style, add toolbox, replace hard coded config, handle default branches.