major cleanup of bullshit