Minimal cleanup
Revisit second layer

The construction of the second layer is now a lot cleaner and saner,
with a more intuitive approach.