Cleaned up script loading