Fix Up my Hungover code