improved method names, removed comments