Simplify data structure and layout