Cleaner comments and code fixes