[fx] code cleaning and clarification