Cleaned white-spaces
conflict resolved: whitespaces