Code cleanup - partly done