FCUK gateway tidyup