-Simplify code