Try to simplify code