Code warning cleanup