Cleaning, Minor Optimizing and If(...) cleaning