 
     var safariViewController: SFSafariViewController? = nil
 
+    // MARK: Private Constants
+
     private let ClientIDKey : String = "ClientID"
     private let ClientSecretKey : String = "ClientSecret"
+
+    // MARK: Computed Properties
 
     var clientId : String {
         get {

                self.statusLabel.text = error.localizedDescription
            }
        }

    }

    internal func getAtheleteByID() {

    deinit {
        NSNotificationCenter.defaultCenter().removeObserver(self, name: StravaAuthorizationCompletedNotification, object: nil)
    }

    // MARK: User Actions

    @IBAction func accessButtonTapped(sender: AnyObject) {
        if !Strava.isAuthenticated {
