Slight optimisation and comments