Small code cleanup. Updates #14.