Fix #10 (clean up)