cleaned up code in liquor view