Temporary changes addressing some PR comments. Please don't review this iteration yet.