API tick and refactor