simplification & warning removal