Code warnings cleanup