changed to look nicer and less clutter...