Add usage(), minor code cleanups