Cleaned up for GitHub upload