Optimising Angular structure