Fixing extra whitespace and some customization