Cleaned Up
CleanedUp2