and a bit of code style
seems to fit the layer much better as we really have a very reduced instruction set