simplified/improved table structure slightly