Completed moving production properties on server
Improved code quality accoring to sonar