Cleaned Up Some Stuff