got rid of horrible "my___" names