Simplify code in some places