refactored on beer