Cleaning up syntax

removing semi-colons
cleaning closure syntax
removing self as it’s inferred
using let unless var is needed
using optionals to avoid alloc'ing objects that are thrown away
using just the dot portion of enums