Small changes made to allow code review for all files