Cleaning up impl, recompile to improve performance