Adds some stylin and tidying up.