Added comments
Removed some unused code
Use new service for outline