Performance increases

Signed-off-by: Matthias Kümmerer <matthias@matthias-k.org>