make sure it complies better with existing coding guidelines