refactor(3): minor changes, add labels