Click refactor