Code cleanup

(see #5)