Convert fields to local variables
Remove unnecessary supers
Miscellaneous cleanup