Removed incorrect comment, and inlined a few method calls