Simplify code base