cleanup, optimization & bump to 1.1

Signed-off-by: Daan Kortenbach <daan@kortenbach.org>