Fixed up the structure a little.