Did some Minor Cleaning