Refactored composite code
Merge pull request #9 from Bigspencey/composite-adjustments

Refactored composite code