Rain Code Review Comments