diff --git a/src/WPStrava/ActivityRenderer.php b/src/WPStrava/ActivityRenderer.php
new file mode 100644
index 0000000..8a356b5
--- /dev/null
+++ b/src/WPStrava/ActivityRenderer.php
@@ -0,0 +1,147 @@
+<?php
+/*
+ * ActivityRenderer has all the markup for the Activity Block & Shortcode.
+ */
+class WPStrava_ActivityRenderer {
+
+	/**
+	 * Get the HTML for a single activity.
+	 *
+	 * @param array $atts
+	 * @return string HTML for an activity.
+	 * @author Justin Foell <justin@foell.org>
+	 * @since  2.2.0
+	 */
+	public function get_html( $atts ) {
+		$defaults = array(
+			'id'         => 0,
+			'som'        => WPStrava::get_instance()->settings->som,
+			'map_width'  => '480',
+			'map_height' => '320',
+			'client_id'  => WPStrava::get_instance()->settings->get_default_id(),
+			'markers'    => false,
+			'image_only' => false,
+		);
+
+		$atts = wp_parse_args( $atts, $defaults );
+
+		/* Make sure boolean values are actually boolean
+		 * @see https://wordpress.stackexchange.com/a/119299
+		 */
+		$atts['markers']    = filter_var( $atts['markers'], FILTER_VALIDATE_BOOLEAN );
+		$atts['image_only'] = filter_var( $atts['image_only'], FILTER_VALIDATE_BOOLEAN );
+
+		$activity         = WPStrava::get_instance()->activity;
+		$activity_details = null;
+
+		try {
+			$activity_details = $activity->get_activity( $atts['client_id'], $atts['id'] );
+		} catch ( WPStrava_Exception $e ) {
+			return $e->to_html();
+		}
+
+		$activity_output = '';
+		if ( $activity_details ) {
+			$activity_output .= '<div id="activity-header-' . $atts['id'] . '" class="wp-strava-activity-container">';
+			if ( ! $atts['image_only'] ) {
+				$activity_output .= $this->get_table( $activity_details, $atts['som'] );
+			}
+
+			// Sanitize width & height.
+			$map_width  = str_replace( '%', '', $atts['map_width'] );
+			$map_height = str_replace( '%', '', $atts['map_height'] );
+			$map_width  = str_replace( 'px', '', $map_width );
+			$map_height = str_replace( 'px', '', $map_height );
+
+			$activity_output .= '<a title="' . $activity_details->name . '" href="' . WPStrava_Activity::ACTIVITIES_URL . $activity_details->id . '">' .
+				WPStrava_StaticMap::get_image_tag( $activity_details, $map_height, $map_width, $atts['markers'] ) .
+				'</a>
+			</div>';
+		} // End if( $activity_details ).
+		return $activity_output;
+	}
+
+	/**
+	 * The the activity details in in HTML table.
+	 *
+	 * @param string $activity_details Activity details from the activity class.
+	 * @param string $som System of measure (english/metric).
+	 * @return string HTML Table of activity details.
+	 * @author Justin Foell <justin@foell.org>
+	 * @author Sebastian Erb <mail@sebastianerb.com>
+	 * @since  1.7.0
+	 */
+	private function get_table( $activity_details, $som ) {
+		$strava_som          = WPStrava_SOM::get_som( $som );
+		$strava_activitytype = WPStrava_ActivityType::get_type_group( $activity_details->type );
+		$avg_title           = '<th>' . __( 'Average Speed', 'wp-strava' ) . '</th>';
+		$max_title           = '<th>' . __( 'Max Speed', 'wp-strava' ) . '</th>';
+		$elevation_title     = '<th>' . __( 'Elevation Gain', 'wp-strava' ) . '</th>';
+		$avg_speed           = '';
+		$max_speed           = '';
+		$elevation           = '<td>' . $strava_som->elevation( $activity_details->total_elevation_gain ) . '</td>';
+		$speed_label         = '';
+		$elevation_label     = '<td>' . $strava_som->get_elevation_label() . '</td>';
+
+		switch ( $strava_activitytype ) {
+			case WPStrava_ActivityType::TYPE_GROUP_PACE:
+				$avg_speed   = '<td>' . $strava_som->pace( $activity_details->average_speed ) . '</td>';
+				$max_speed   = '<td>' . $strava_som->pace( $activity_details->max_speed ) . '</td>';
+				$speed_label = '<td>' . $strava_som->get_pace_label() . '</td>';
+				break;
+			case WPStrava_ActivityType::TYPE_GROUP_SPEED:
+				$avg_speed   = '<td>' . $strava_som->speed( $activity_details->average_speed ) . '</td>';
+				$max_speed   = '<td>' . $strava_som->speed( $activity_details->max_speed ) . '</td>';
+				$speed_label = '<td>' . $strava_som->get_speed_label() . '</td>';
+				break;
+			case WPStrava_ActivityType::TYPE_GROUP_PACE:
+				$avg_speed   = '<td>' . $strava_som->swimpace( $activity_details->average_speed ) . '</td>';
+				$max_speed   = '<td>' . $strava_som->swimpace( $activity_details->max_speed ) . '</td>';
+				$speed_label = '<td>' . $strava_som->get_swimpace_label() . '</td>';
+				break;
+			default:
+				$avg_title = '';
+				$max_title = '';
+				break;
+		}
+
+		if ( WPStrava::get_instance()->settings->hide_elevation ) {
+			$elevation       = '';
+			$elevation_title = '';
+			$elevation_label = '';
+		}
+
+		return '
+			<table id="activity-details-table">
+				<thead>
+					<tr>
+						<th>' . __( 'Elapsed Time', 'wp-strava' ) . '</th>
+						<th>' . __( 'Moving Time', 'wp-strava' ) . '</th>
+						<th>' . __( 'Distance', 'wp-strava' ) . '</th>
+						' . $avg_title . '
+						' . $max_title . '
+						' . $elevation_title . '
+					</tr>
+				</thead>
+				<tbody>
+					<tr class="activity-details-table-info">
+						<td>' . $strava_som->time( $activity_details->elapsed_time ) . '</td>
+						<td>' . $strava_som->time( $activity_details->moving_time ) . '</td>
+						<td>' . $strava_som->distance( $activity_details->distance ) . '</td>
+						' . $avg_speed . '
+						' . $max_speed . '
+						' . $elevation . '
+					</tr>
+					<tr class="activity-details-table-units">
+						<td>' . $strava_som->get_time_label() . '</td>
+						<td>' . $strava_som->get_time_label() . '</td>
+						<td>' . $strava_som->get_distance_label() . '</td>
+						' . $speed_label . '
+						' . $speed_label . '
+						' . $elevation_label . '
+					</tr>
+				</tbody>
+			</table>
+		';
+	}
+}
diff --git a/src/WPStrava/ActivityShortcode.php b/src/WPStrava/ActivityShortcode.php
index eb63ad3..8350294 100644
--- a/src/WPStrava/ActivityShortcode.php
+++ b/src/WPStrava/ActivityShortcode.php
@@ -51,136 +51,8 @@ class WPStrava_ActivityShortcode {
 
 		$this->add_script = true;
 
-		$defaults = array(
-			'id'         => 0,
-			'som'        => WPStrava::get_instance()->settings->som,
-			'map_width'  => '480',
-			'map_height' => '320',
-			'client_id'  => WPStrava::get_instance()->settings->get_default_id(),
-			'markers'    => false,
-			'image_only' => false,
-		);
-
-		$atts = shortcode_atts( $defaults, $atts, 'activity' );
-
-		/* Make sure boolean values are actually boolean
-		 * @see https://wordpress.stackexchange.com/a/119299
-		 */
-		$atts['markers']    = filter_var( $atts['markers'], FILTER_VALIDATE_BOOLEAN );
-		$atts['image_only'] = filter_var( $atts['image_only'], FILTER_VALIDATE_BOOLEAN );
-
-		$activity         = WPStrava::get_instance()->activity;
-		$activity_details = null;
-
-		try {
-			$activity_details = $activity->get_activity( $atts['client_id'], $atts['id'] );
-		} catch ( WPStrava_Exception $e ) {
-			return $e->to_html();
-		}
-
-		$activity_output = '';
-		if ( $activity_details ) {
-			$activity_output .= '<div id="activity-header-' . $atts['id'] . '" class="wp-strava-activity-container">';
-			if ( ! $atts['image_only'] ) {
-				$activity_output .= $this->get_table( $activity_details, $atts['som'] );
-			}
-
-			// Sanitize width & height.
-			$map_width  = str_replace( '%', '', $atts['map_width'] );
-			$map_height = str_replace( '%', '', $atts['map_height'] );
-			$map_width  = str_replace( 'px', '', $map_width );
-			$map_height = str_replace( 'px', '', $map_height );
-
-			$activity_output .= '<a title="' . $activity_details->name . '" href="' . WPStrava_Activity::ACTIVITIES_URL . $activity_details->id . '">' .
-				WPStrava_StaticMap::get_image_tag( $activity_details, $map_height, $map_width, $atts['markers'] ) .
-				'</a>
-			</div>';
-		} // End if( $activity_details ).
-		return $activity_output;
-	}
-
-	/**
-	 * The the activity details in in HTML table.
-	 *
-	 * @param string $activity_details Activity details from the activity class.
-	 * @param string $som System of measure (english/metric).
-	 * @return string HTML Table of activity details.
-	 * @author Justin Foell <justin@foell.org>
-	 * @author Sebastian Erb <mail@sebastianerb.com>
-	 * @since  1.7.0
-	 */
-	private function get_table( $activity_details, $som ) {
-		$strava_som          = WPStrava_SOM::get_som( $som );
-		$strava_activitytype = WPStrava_ActivityType::get_type_group( $activity_details->type );
-		$avg_title           = '<th>' . __( 'Average Speed', 'wp-strava' ) . '</th>';
-		$max_title           = '<th>' . __( 'Max Speed', 'wp-strava' ) . '</th>';
-		$elevation_title     = '<th>' . __( 'Elevation Gain', 'wp-strava' ) . '</th>';
-		$avg_speed           = '';
-		$max_speed           = '';
-		$elevation           = '<td>' . $strava_som->elevation( $activity_details->total_elevation_gain ) . '</td>';
-		$speed_label         = '';
-		$elevation_label     = '<td>' . $strava_som->get_elevation_label() . '</td>';
-
-		switch ( $strava_activitytype ) {
-			case WPStrava_ActivityType::TYPE_GROUP_PACE:
-				$avg_speed   = '<td>' . $strava_som->pace( $activity_details->average_speed ) . '</td>';
-				$max_speed   = '<td>' . $strava_som->pace( $activity_details->max_speed ) . '</td>';
-				$speed_label = '<td>' . $strava_som->get_pace_label() . '</td>';
-				break;
-			case WPStrava_ActivityType::TYPE_GROUP_SPEED:
-				$avg_speed   = '<td>' . $strava_som->speed( $activity_details->average_speed ) . '</td>';
-				$max_speed   = '<td>' . $strava_som->speed( $activity_details->max_speed ) . '</td>';
-				$speed_label = '<td>' . $strava_som->get_speed_label() . '</td>';
-				break;
-			case WPStrava_ActivityType::TYPE_GROUP_PACE:
-				$avg_speed   = '<td>' . $strava_som->swimpace( $activity_details->average_speed ) . '</td>';
-				$max_speed   = '<td>' . $strava_som->swimpace( $activity_details->max_speed ) . '</td>';
-				$speed_label = '<td>' . $strava_som->get_swimpace_label() . '</td>';
-				break;
-			default:
-				$avg_title = '';
-				$max_title = '';
-				break;
-		}
-
-		if ( WPStrava::get_instance()->settings->hide_elevation ) {
-			$elevation       = '';
-			$elevation_title = '';
-			$elevation_label = '';
-		}
-
-		return '
-			<table id="activity-details-table">
-				<thead>
-					<tr>
-						<th>' . __( 'Elapsed Time', 'wp-strava' ) . '</th>
-						<th>' . __( 'Moving Time', 'wp-strava' ) . '</th>
-						<th>' . __( 'Distance', 'wp-strava' ) . '</th>
-						' . $avg_title . '
-						' . $max_title . '
-						' . $elevation_title . '
-					</tr>
-				</thead>
-				<tbody>
-					<tr class="activity-details-table-info">
-						<td>' . $strava_som->time( $activity_details->elapsed_time ) . '</td>
-						<td>' . $strava_som->time( $activity_details->moving_time ) . '</td>
-						<td>' . $strava_som->distance( $activity_details->distance ) . '</td>
-						' . $avg_speed . '
-						' . $max_speed . '
-						' . $elevation . '
-					</tr>
-					<tr class="activity-details-table-units">
-						<td>' . $strava_som->get_time_label() . '</td>
-						<td>' . $strava_som->get_time_label() . '</td>
-						<td>' . $strava_som->get_distance_label() . '</td>
-						' . $speed_label . '
-						' . $speed_label . '
-						' . $elevation_label . '
-					</tr>
-				</tbody>
-			</table>
-		';
+		$renderer = new WPStrava_ActivityRenderer();
+		return $renderer->get_html( $atts );
 	}
 
 	/**