Refactor overlay init/free