Changes after codereview