Cleaned Code with Arun