Code cleanup- 1