Updated code base accordingly to the reviewer notes