Fixed spacing issue and service include