simplified per code inspection comments