Cleaned up script...