Added more code maintenance items.