Clean code after review