Code cleanup
Overview added