-- improve quality code and cleaning