Cleanup, work on #10