- Remove Java classes
- Use short form of accessors