Organized for easier distribution and minor cleanup