Simplify the implementation