Little bit cleaner layout

Signed-off-by: Mathias Kaufmann <me@stei.gr>