Cleaning

For te code matters, some names remains with Bombardi references; this
ws made for simplicity reasons