removed unneeded setting.
Only whitespace removal
Code style fixes for layouts
Mergeando