Clean code, fix indentation
Add entities webservice