// Code cleaning and small fixes