Modifications following code review