Molly - refactoring