Minor markup add: notes on most obvious places to start refactor