Cleaned Code -