Improving the layout and whitespace
Fix merge