Improved organization, improved script