heat seeking
readability improvements