Code review comments, and made this more generic