Started some work on cleaning up autofisher code