Organized a bit for style