Add default value of null for optional params
Qualify class names
Add return by ref to methods when necessary