Cleaned comments
Added service, doesn't work as it should though