A little better structure in there for organization