Refactoring @illessen-apps