Cleaned up setup.php