Fix coding style
Refactor overlays