improve view
improve view
source cleanup