Revert "Updated Borgs. Standardized a bit of code, some cleanliness, etc."

This reverts commit a8cea0db41b4755f82d0ed93a4bde76e4221ee1f.