Code clean-up started