Simplify methods and harden their signature