structured things a little better