Refactor bullshit