Recompile and refactor