replaced some code with semantically clearer methods