Refactoring YeahBithcas