updated

I decided to keep it D.R.Y. ;)