formatting and removing more references for things I don't care about