- Some variables made local
- Simple conversion to the excitonic picture at input