Make code more unobtrusive