- cleaned some code
- post merge fix