clean code after review