Refactoring - make it more emberish