Removed unsed property object

Others:
- Format and comments
- Added 'covers' annotations