Cleaned up system script