Making things look nicer (still a mess). Rewrite