Optimised

Less code