Remove unnecessary context argument.
Documentation and better method naming.