Flux Layout - code and output refactoring

Just a-little tidying.