remove cruft, increase method readability