Added 'Deprecated' attribute

Plus some code tidying up.