more code review changes made w/ Young Suk