Organized code a little bit.