Feature/zookeeper server cleanup

- [x] Fixes whitespace
- [x] Cleanup rubocop complaints