Got rid of some excess logic