fixed mentioned review issues