Comments tweaks and minor organization on files and structure