Cleaned up batch file