[IMP] project : Improve code