Code cleanup

issue #19