cosmetic code clean up