Cleaning up syntax

removing semi-colons
cleaning closure syntax
removing self as it’s inferred
using let unless var is needed