some small changes to layout and var names

Signed-off-by: Alexander Skjolden <alex@plastboks.net>