Fixed Bug 1110833

Fixed Bug 1110833

Cleaned whitespace

Cleaned all the files