Flortd code review complete pull request

Code review complete.