Minor cleanup, close #10