Some clean up: Fix lqi's remark about name.