Updated service documentation and cleaned up