Moeny code refactor