Fix review comments - improve documentation and code readabilty