comments #2 - small bugfix and psr

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