Beautifyfix

@e-schultz please merge