Made another file more readable