Fancy Update, Code Cleanup and Refractoring