Minor cleanup
Cleaned up some whitespaces and created a notificationBlock to use with addObserverForName.