cleanup suggested by mohawk on #inline