Fix spacing and textwidth issues