Decompose and add comments