Simplify and organize