badass refactor