Issue 396 - Adjusting for code style.