Enhancement:

 - Slightly more efficient addressing while decomposing