Simplify & prettify