Adjust composer libraries and minor coding style changes