Updates to Beret, cleaner code in Main()