Beautifying, refs #30