- improved layout
- cleanup