- added framework headers
- refactoring and cleanup