Beautify fix

@e-schultz please merge