Got rid of some silly mistakes