Add comments and renaming