fix code after review