Applying review comments from @cvasilak