Structural improvements; thanks to MarkWithall :-).