Simplify & some minor fix