Made some methods clearer