Clean up - added new usage options