Simplickr refactoring