Update: Code Clean Up