reorganize and add comments
add assetic