Keep STR, comment, reorganize code