code clean to remove warnings