few refactoring for more conventionaly code view
few refactoring for more conventionaly code view
few fefactoring for more pretty
add TODO in contour src