Cleaned Code 2.0