decomposition
Refactoring done. Now working on clickaction