Trailers: Small code clean up