Refactor comment blocks, loading and view more patterns