Style changes for rondo's solver + change to the getSolution