Revert "code review fixes #1"

This reverts commit 283782012976ff54446cc7aa241a8b6de6af8485.