Review and cleanup the commit by Antti