Replaced occurence of 'all' as a named paramter with 'all_' and other code readability changes