Refactoring andy