Minor update (0.9l)

Tweaked code layout