Code cleanup

see #134