raphael branching cleanup... still learning