code clean ups