Further improvements

Signed-off-by: Gerco van Heerdt <gercovanheerdt@gmail.com>