Cleaned up the beer class a bit