Fix composer and code style