Added usage docs and cleaned up