Applying review feedback from cvasilak