Refactor Baddie class