removed unnecessary comments
added service, tested