cleanups

- remove "my" prefix from some fields
- optimize imports