Improving some of the spacing for better readability