Cleaning up the composer plugin a little