Translation in FR and cleanups

Refs #1