Tidy up source comments and rearrange definitions based on latest skel