Corrected documentation
Corrected default lifetime
Comment cleanup