Cleaned up entry script