changed a few method names to be a tad more descriptive/consistent