Fixed files for Code Review