- code cleanup
- add new header file for AWS data types