Not going to bother re-commenting. Generally looks good :)