Reorganize and simplify