some small changes in my way to clean up some of the code

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