Some code markups after review