Cleanup minor code nits