Re: #431 - spacing and separator fixes