incorporated LK4D4's suggestions for improvement

Signed-off-by: Malte Janduda <mail@janduda.net>