code review changes

see https://github.com/GigaOM/legacy-pro/issues/4525