Cleanup and more info for composer