try to organize things a little