cleanup and refactor name