More style cleanup.
Closures kill. Save scope to self so properties can be accessed correctly!