Added new content and aligned code

- Added new content
- Aligned code