Update - Cleaned Code.