DATACOUCH-27 - Code review suggestions.