Made generation of 'id' external
Nano tidyup
Removed 'PreRecovery' annotation
Used variable for version
Used variable for guava version