Minor changes. Code cleaning.