Move gap fill to its own method
Code cleanup and remove arc compensation code