Cleaned Up while working