More CodeNarc cleanup
- space after comma
- optimize imports