White spaces cleaning
Small changes