Code cleanup- 2