Cleaned up some more
Cleaned up pt3