Refactor, flymake improvements