Bacon - Some cleanup