Update: Code clean-up