Cleaned up some Code.