Got rid of unnecessary bullshit