cleaning up beaker file - starting to look good