Code clean up started