cleanup, remove duplication, fix issues api usage