Organize code a little better.