Webapp big refactor

#348
inside method please use simple comment here one line comment `//`