Styling fixes + lexicon

Signed-off-by: Gauke Pieter Sietzema <gp@sterc.nl>