Organized things a bit better.