#14 Apply review comments
#14 Apply new review comments