Updated common lib to reach code conventions