Comments & small optimisations