Avoid side-effecting nullary methods
Improved documentation to avoid warnings