common: code cleanup
Merge pull request #21 from romanosipenko/web

common: code cleanup