Cleaning code
Layers ready to be implemented (Flat is a layer example)