Cleaned up a bunch of redundancies