1) Fix whitespace on unnamed functions
2) Replace deprecated getter/setter methods with standard methods