Organizing the code a bit.