Simplified data structure a bit.