LayerController code style changes