Cleaned Up

Cleaned Up A Bit. Near Release.