FA JR Rev - code cleanup