More Code Cleanup. / Can Support other overlays if wanted.