Fix procedure style warnings