+ hero and properties
- clean up source code