diff --git a/bp-templates/bp-nouveau/buddypress-functions.php b/bp-templates/bp-nouveau/buddypress-functions.php
index 88af7a9..73f31b2 100644
--- a/bp-templates/bp-nouveau/buddypress-functions.php
+++ b/bp-templates/bp-nouveau/buddypress-functions.php
@@ -53,7 +53,7 @@ class BP_Nouveau extends BP_Theme_Compat {
 	public static function get_instance() {
 
 		// If the single instance hasn't been set, set it now.
-		if ( null == self::$instance ) {
+		if ( null === self::$instance ) {
 			self::$instance = new self;
 		}
 
@@ -638,7 +638,7 @@ public function setup_directory_nav() {
 	 * warnings inside the Browser console to avoid
 	 * messing with the page display.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string HTML Output
 	 */
@@ -684,7 +684,7 @@ public function neutralize_core_template_notices(){
 	/**
 	 * Set the BP Uri for the customizer in case of Ajax requests.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  string $path the BP Uri.
 	 * @return string       the BP Uri.
@@ -712,7 +712,7 @@ public function customizer_set_uri( $path ) {
 	/**
 	 * Loads the translation files
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 */
 	public function load_textdomain() {
 		// Traditional WordPress plugin locale filter
@@ -735,7 +735,7 @@ public function load_textdomain() {
 /**
  * Get a unique instance of BP Nouveau
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return BP_Nouveau the main instance of the class
  */
diff --git a/bp-templates/bp-nouveau/buddypress/_accessoires/invites/index.php b/bp-templates/bp-nouveau/buddypress/_accessoires/invites/index.php
index aa06e38..f945e71 100644
--- a/bp-templates/bp-nouveau/buddypress/_accessoires/invites/index.php
+++ b/bp-templates/bp-nouveau/buddypress/_accessoires/invites/index.php
@@ -12,7 +12,7 @@
 ?>
 <nav class="bp-navs bp-subnavs group-subnav bp-invites-nav" id="subnav" role="navigation" aria-label="<?php esc_attr_e( 'Group invitations menu', 'buddypress' ); ?>"></nav>
 
-<h2 class="bp-screen-title <?php if(bp_is_group_create()) echo 'creation-step-name'; ?>">
+<h2 class="bp-screen-title <?php if ( bp_is_group_create() ) { echo esc_attr( 'creation-step-name' ); } ?>">
 	<?php _e( 'Invite Members', 'bp-nouveau' ); ?>
 </h2>
 
diff --git a/bp-templates/bp-nouveau/buddypress/_accessoires/messages/index.php b/bp-templates/bp-nouveau/buddypress/_accessoires/messages/index.php
index c32c1b0..d41424f 100644
--- a/bp-templates/bp-nouveau/buddypress/_accessoires/messages/index.php
+++ b/bp-templates/bp-nouveau/buddypress/_accessoires/messages/index.php
@@ -78,7 +78,7 @@
 		<div class="bp-search messages-search">
 			<form action="" method="get" id="user_messages_search_form" class="bp-messages-search-form" data-bp-search="messages">
 				<label for="user_messages_search" class="bp-screen-reader-text">
-					<?php _e('Search Messages', 'bp-nouveau'); ?>
+					<?php _e( 'Search Messages', 'bp-nouveau' ); ?>
 				</label>
 				<input type="search" id="user_messages_search" placeholder="<?php esc_attr_e( __( 'Search', 'bp-nouveau' ) ); ?>"/>
 				<button type="submit" id="user_messages_search_submit">
@@ -123,7 +123,7 @@
 	</div>
 	<div class="thread-from">
 		<a class="user-link" href="{{data.sender_link}}">
-			<img class="avatar" src="{{data.sender_avatar}}" alt="{{data.sender_name}}<?php esc_attr_e(' profile picture', 'bp-nouveau'); ?>" />
+			<img class="avatar" src="{{data.sender_avatar}}" alt="{{data.sender_name}}<?php esc_attr_e( ' profile picture', 'bp-nouveau' ); ?>" />
 			<span class="user-name">{{data.sender_name}}</span>
 		</a>
 	</div>
@@ -152,7 +152,7 @@
 						<dd>
 							<ul class="participants-list">
 								<# for ( i in data.recipients ) { #>
-									<li><a href="{{data.recipients[i].user_link}}" class="bp-tooltip" data-bp-tooltip="{{data.recipients[i].user_name}}"><img class="avatar mini" src="{{data.recipients[i].avatar}}" alt="{{data.recipients[i].user_name}}<?php esc_attr_e(' profile picture', 'bp-nouveau'); ?>" /></a></li>
+									<li><a href="{{data.recipients[i].user_link}}" class="bp-tooltip" data-bp-tooltip="{{data.recipients[i].user_name}}"><img class="avatar mini" src="{{data.recipients[i].avatar}}" alt="{{data.recipients[i].user_name}}<?php esc_attr_e( ' profile picture', 'bp-nouveau' ); ?>" /></a></li>
 								<# } #>
 							</ul>
 						</dd>
@@ -201,7 +201,7 @@
 				<dd>
 					<ul class="participants-list">
 						<# for ( i in data.recipients ) { #>
-							<li><a href="{{data.recipients[i].user_link}}" class="bp-tooltip" data-bp-tooltip="{{data.recipients[i].user_name}}"><img class="avatar mini" src="{{data.recipients[i].avatar}}"  alt="{{data.recipients[i].user_name}}<?php esc_attr_e(' profile picture', 'bp-nouveau'); ?>" /></a></li>
+							<li><a href="{{data.recipients[i].user_link}}" class="bp-tooltip" data-bp-tooltip="{{data.recipients[i].user_name}}"><img class="avatar mini" src="{{data.recipients[i].avatar}}"  alt="{{data.recipients[i].user_name}}<?php esc_attr_e( ' profile picture', 'bp-nouveau' ); ?>" /></a></li>
 						<# } #>
 					</ul>
 				</dd>
@@ -224,7 +224,7 @@
 		<?php bp_nouveau_messages_hook( 'before', 'meta' ); ?>
 
 		<a href="{{data.sender_link}}" class="user-link">
-			<img class="avatar" src="{{data.sender_avatar}}" alt="{{data.sender_name}}<?php esc_attr_e(' profile picture', 'bp-nouveau'); ?>" />
+			<img class="avatar" src="{{data.sender_avatar}}" alt="{{data.sender_name}}<?php esc_attr_e( ' profile picture', 'bp-nouveau' ); ?>" />
 			<strong>{{data.sender_name}}</strong>
 		</a>
 
diff --git a/bp-templates/bp-nouveau/buddypress/activity/activity-loop.php b/bp-templates/bp-nouveau/buddypress/activity/activity-loop.php
index 409b72b..82f3c05 100644
--- a/bp-templates/bp-nouveau/buddypress/activity/activity-loop.php
+++ b/bp-templates/bp-nouveau/buddypress/activity/activity-loop.php
@@ -27,7 +27,7 @@
 <?php else : ?>
 
 	<li id="activity-stream-message" class="bp-messages info">
-		<?php bp_nouveau_user_feedback( 'activity-loop-none' ) ;?>
+		<?php bp_nouveau_user_feedback( 'activity-loop-none' ); ?>
 	</li>
 
 <?php endif; ?>
diff --git a/bp-templates/bp-nouveau/buddypress/activity/comment.php b/bp-templates/bp-nouveau/buddypress/activity/comment.php
index e246f4b..16c90fe 100644
--- a/bp-templates/bp-nouveau/buddypress/activity/comment.php
+++ b/bp-templates/bp-nouveau/buddypress/activity/comment.php
@@ -20,13 +20,13 @@
 
 	<div class="acomment-meta">
 
-		<?php bp_nouveau_activity_comment_action() ;?>
+		<?php bp_nouveau_activity_comment_action(); ?>
 
 	</div>
 
 	<div class="acomment-content"><?php bp_activity_comment_content(); ?></div>
 
-	<?php bp_nouveau_activity_comment_buttons( array('container' => 'div') );?>
+	<?php bp_nouveau_activity_comment_buttons( array( 'container' => 'div' ) );?>
 
 	<?php bp_nouveau_activity_recurse_comments( bp_activity_current_comment() ); ?>
 </li>
diff --git a/bp-templates/bp-nouveau/buddypress/activity/entry.php b/bp-templates/bp-nouveau/buddypress/activity/entry.php
index 9afde49..b1d6236 100644
--- a/bp-templates/bp-nouveau/buddypress/activity/entry.php
+++ b/bp-templates/bp-nouveau/buddypress/activity/entry.php
@@ -18,7 +18,7 @@
 
 		<a href="<?php bp_activity_user_link(); ?>">
 
-			<?php bp_activity_avatar( array('type' => 'full') ); ?>
+			<?php bp_activity_avatar( array( 'type' => 'full' ) ); ?>
 
 		</a>
 
diff --git a/bp-templates/bp-nouveau/buddypress/activity/index.php b/bp-templates/bp-nouveau/buddypress/activity/index.php
index 0695db4..2954c91 100644
--- a/bp-templates/bp-nouveau/buddypress/activity/index.php
+++ b/bp-templates/bp-nouveau/buddypress/activity/index.php
@@ -27,7 +27,7 @@
 
 	<div class="screen-content">
 
-		<?php bp_get_template_part( 'common/search-&-filters-bar' ); ?>
+		<?php bp_get_template_part( 'common/search-and-filters-bar' ); ?>
 
 		<?php bp_nouveau_activity_hook( 'before_directory', 'list' ); ?>
 
@@ -35,12 +35,12 @@
 
 			<ul id="activity-stream" class="activity-list item-list bp-list" data-bp-list="activity">
 
-			 	<li id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'directory-activity-loading' ) ;?></li>
+			 	<li id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'directory-activity-loading' ); ?></li>
 
 			</ul>
 
 		</div><!-- .activity -->
 
-		<?php bp_nouveau_after_activity_directory_content() ;?>
+		<?php bp_nouveau_after_activity_directory_content(); ?>
 	</div><!-- // .screen-content -->
 
diff --git a/bp-templates/bp-nouveau/buddypress/activity/post-form.php b/bp-templates/bp-nouveau/buddypress/activity/post-form.php
index 528ef6f..b9d1c4d 100644
--- a/bp-templates/bp-nouveau/buddypress/activity/post-form.php
+++ b/bp-templates/bp-nouveau/buddypress/activity/post-form.php
@@ -13,7 +13,7 @@
  * Template tag to prepare the activity post form
  * checks capability and enqueue needed scripts.
  */
-bp_nouveau_before_activity_post_form() ;?>
+bp_nouveau_before_activity_post_form(); ?>
 
 <div id="bp-nouveau-activity-form" class="activity-update-form"></div>
 
@@ -22,4 +22,4 @@
  * Template tag to load the Javascript
  * templates of the Post form UI
  */
-bp_nouveau_after_activity_post_form() ;?>
+bp_nouveau_after_activity_post_form(); ?>
diff --git a/bp-templates/bp-nouveau/buddypress/activity/single/home.php b/bp-templates/bp-nouveau/buddypress/activity/single/home.php
index 79865c4..1cb7609 100644
--- a/bp-templates/bp-nouveau/buddypress/activity/single/home.php
+++ b/bp-templates/bp-nouveau/buddypress/activity/single/home.php
@@ -14,7 +14,7 @@
 
 		<ul id="activity-stream" class="activity-list item-list bp-list" data-bp-list="activity">
 
-			<li id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'single-activity-loading' ) ;?></li>
+			<li id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'single-activity-loading' ); ?></li>
 
 		</ul>
 
diff --git a/bp-templates/bp-nouveau/buddypress/activity/widget.php b/bp-templates/bp-nouveau/buddypress/activity/widget.php
index 86508cc..3fa9565 100644
--- a/bp-templates/bp-nouveau/buddypress/activity/widget.php
+++ b/bp-templates/bp-nouveau/buddypress/activity/widget.php
@@ -32,7 +32,7 @@
 								</a>
 							</cite>
 
-							<?php echo bp_insert_activity_meta() ;?>
+							<?php echo bp_insert_activity_meta(); ?>
 
 						</footer>
 
@@ -51,7 +51,7 @@
 <?php else : ?>
 
 	<div class="widget-error">
-		<?php bp_nouveau_user_feedback( 'activity-loop-none' ) ;?>
+		<?php bp_nouveau_user_feedback( 'activity-loop-none' ); ?>
 	</div>
 
 <?php endif; ?>
diff --git a/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php b/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php
index 143625a..6214ab1 100644
--- a/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php
+++ b/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php
@@ -4,6 +4,6 @@
 				<div class="wp-embed-meta">
 					<?php
 					/** This action is documented in wp-includes/theme-compat/embed-content.php */
-					do_action( 'embed_content_meta'); ?>
+					do_action( 'embed_content_meta' ); ?>
 				</div>
-			</div>
\ No newline at end of file
+			</div>
diff --git a/bp-templates/bp-nouveau/buddypress/blogs/index.php b/bp-templates/bp-nouveau/buddypress/blogs/index.php
index ec9eda7..7b00586 100644
--- a/bp-templates/bp-nouveau/buddypress/blogs/index.php
+++ b/bp-templates/bp-nouveau/buddypress/blogs/index.php
@@ -8,7 +8,7 @@
  */
 ?>
 
-	<?php bp_nouveau_before_blogs_directory_content() ;?>
+	<?php bp_nouveau_before_blogs_directory_content(); ?>
 
 	<?php if ( ! bp_nouveau_is_object_nav_in_sidebar() ) : ?>
 
@@ -18,12 +18,12 @@
 
 	<div class="screen-content">
 
-	<?php bp_get_template_part( 'common/search-&-filters-bar' ); ?>
+	<?php bp_get_template_part( 'common/search-and-filters-bar' ); ?>
 
 		<div id="blogs-dir-list" class="blogs dir-list" data-bp-list="blogs">
-			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'directory-blogs-loading' ) ;?></div>
+			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'directory-blogs-loading' ); ?></div>
 		</div><!-- #blogs-dir-list -->
 
-		<?php bp_nouveau_after_blogs_directory_content() ;?>
+		<?php bp_nouveau_after_blogs_directory_content(); ?>
 	</div><!-- // .screen-content -->
 
diff --git a/bp-templates/bp-nouveau/buddypress/common/filters/groups-screens-filters.php b/bp-templates/bp-nouveau/buddypress/common/filters/groups-screens-filters.php
index 29db61b..4b0484e 100644
--- a/bp-templates/bp-nouveau/buddypress/common/filters/groups-screens-filters.php
+++ b/bp-templates/bp-nouveau/buddypress/common/filters/groups-screens-filters.php
@@ -13,7 +13,7 @@
 				<span ><?php bp_nouveau_filter_label(); ?></span>
 			</label>
 			<div class="select-wrap">
-				<select id="<?php bp_nouveau_filter_id(); ?>" data-bp-filter="<?php  bp_nouveau_filter_component(); ?>">
+				<select id="<?php bp_nouveau_filter_id(); ?>" data-bp-filter="<?php bp_nouveau_filter_component(); ?>">
 
 					<?php bp_nouveau_filter_options(); ?>
 
diff --git a/bp-templates/bp-nouveau/buddypress/common/filters/user-screens-filters.php b/bp-templates/bp-nouveau/buddypress/common/filters/user-screens-filters.php
index 62765fb..468a5da 100644
--- a/bp-templates/bp-nouveau/buddypress/common/filters/user-screens-filters.php
+++ b/bp-templates/bp-nouveau/buddypress/common/filters/user-screens-filters.php
@@ -13,7 +13,7 @@
 				<span ><?php bp_nouveau_filter_label(); ?></span>
 			</label>
 			<div class="select-wrap">
-				<select id="<?php bp_nouveau_filter_id(); ?>" data-bp-filter="<?php  bp_nouveau_filter_component(); ?>">
+				<select id="<?php bp_nouveau_filter_id(); ?>" data-bp-filter="<?php bp_nouveau_filter_component(); ?>">
 
 					<?php bp_nouveau_filter_options(); ?>
 
diff --git a/bp-templates/bp-nouveau/buddypress/common/notices/template-notices.php b/bp-templates/bp-nouveau/buddypress/common/notices/template-notices.php
index 64af476..21077aa 100644
--- a/bp-templates/bp-nouveau/buddypress/common/notices/template-notices.php
+++ b/bp-templates/bp-nouveau/buddypress/common/notices/template-notices.php
@@ -13,7 +13,7 @@
 
 	<?php if ( bp_nouveau_has_dismiss_button() ) : ?>
 
-		<button type="button" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Close', 'bp-nouveau'); ?>" aria-label="<?php esc_attr_e( 'Close this notice', 'bp-nouveau'); ?>" data-bp-close="<?php bp_nouveau_dismiss_button_type(); ?>"><span class="dashicons dashicons-dismiss" aria-hidden="true"></span></button>
+		<button type="button" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Close', 'bp-nouveau' ); ?>" aria-label="<?php esc_attr_e( 'Close this notice', 'bp-nouveau' ); ?>" data-bp-close="<?php bp_nouveau_dismiss_button_type(); ?>"><span class="dashicons dashicons-dismiss" aria-hidden="true"></span></button>
 
 	<?php endif ; ?>
 </aside>
diff --git a/bp-templates/bp-nouveau/buddypress/common/search-&-filters-bar.php b/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php
similarity index 75%
rename from bp-templates/bp-nouveau/buddypress/common/search-&-filters-bar.php
rename to bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php
index a80ea49..8c63be6 100644
--- a/bp-templates/bp-nouveau/buddypress/common/search-&-filters-bar.php
+++ b/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php
@@ -12,7 +12,7 @@
 	<?php if ( 'friends' !== bp_current_component() ) : ?>
 	<div class="subnav-search clearfix">
 
-		<?php if ( 'activity' == bp_current_component() ) :?>
+		<?php if ( 'activity' === bp_current_component() ) :?>
 			<div class="feed"><a href="<?php bp_sitewide_activity_feed_link(); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'RSS Feed', 'bp-nouveau' ); ?>"><span class="bp-screen-reader-text"><?php _e( 'RSS', 'bp-nouveau' ); ?></span></a></div>
 		<?php endif; ?>
 
@@ -21,9 +21,9 @@
 	</div>
 	<?php endif; ?>
 
-		<?php if ( bp_is_user() && ! bp_is_current_action( 'requests') ) : ?>
-			<?php bp_get_template_part('common/filters/user-screens-filters'); ?>
-		<?php elseif ( 'groups' == bp_current_component() ) : ?>
+		<?php if ( bp_is_user() && ! bp_is_current_action( 'requests' ) ) : ?>
+			<?php bp_get_template_part( 'common/filters/user-screens-filters' ); ?>
+		<?php elseif ( 'groups' === bp_current_component() ) : ?>
 			<?php bp_get_template_part( 'common/filters/groups-screens-filters' );  ?>
 		<?php else : ?>
 			<?php bp_get_template_part( 'common/filters/directory-filters' ); ?>
diff --git a/bp-templates/bp-nouveau/buddypress/common/search/search-form.php b/bp-templates/bp-nouveau/buddypress/common/search/search-form.php
index 05efd5c..655d44a 100644
--- a/bp-templates/bp-nouveau/buddypress/common/search/search-form.php
+++ b/bp-templates/bp-nouveau/buddypress/common/search/search-form.php
@@ -9,13 +9,13 @@
 ?>
 
 <div class="<?php bp_nouveau_search_container_class(); ?> bp-search">
-	<form action="" method="get" class="bp-dir-search-form" id="<?php bp_nouveau_search_selector_id( 'search-form' ) ;?>" role="search" data-bp-search="groups">
+	<form action="" method="get" class="bp-dir-search-form" id="<?php bp_nouveau_search_selector_id( 'search-form' ); ?>" role="search" data-bp-search="groups">
 
-			<label for="<?php bp_nouveau_search_selector_id( 'search' ) ;?>" class="bp-screen-reader-text"><?php bp_nouveau_search_default_text( '', false ); ?></label>
+			<label for="<?php bp_nouveau_search_selector_id( 'search' ); ?>" class="bp-screen-reader-text"><?php bp_nouveau_search_default_text( '', false ); ?></label>
 
-			<input id="<?php bp_nouveau_search_selector_id( 'search' ); ?>" name="<?php bp_nouveau_search_selector_name() ;?>" type="search"  placeholder="<?php bp_nouveau_search_default_text(); ?>" />
+			<input id="<?php bp_nouveau_search_selector_id( 'search' ); ?>" name="<?php bp_nouveau_search_selector_name(); ?>" type="search"  placeholder="<?php bp_nouveau_search_default_text(); ?>" />
 
-			<button type="submit" id="<?php bp_nouveau_search_selector_id( 'search-submit' ) ;?>" class="nouveau-search-submit" name="<?php bp_nouveau_search_selector_name( 'search_submit' ); ?>">
+			<button type="submit" id="<?php bp_nouveau_search_selector_id( 'search-submit' ); ?>" class="nouveau-search-submit" name="<?php bp_nouveau_search_selector_name( 'search_submit' ); ?>">
 				<span class="dashicons dashicons-search" aria-hidden="true"></span>
 				<span id="button-text" class="bp-screen-reader-text"><?php _e( 'Search', 'bp-nouveau' ); ?></span>
 			</button>
diff --git a/bp-templates/bp-nouveau/buddypress/groups/create.php b/bp-templates/bp-nouveau/buddypress/groups/create.php
index 4da0329..303e122 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/create.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/create.php
@@ -8,7 +8,7 @@
 
 bp_nouveau_groups_create_hook( 'before', 'page' ); ?>
 
-	<h2 class="bp-subhead"><?php _e('Create A New Group','bp-nouveau'); ?></h2>
+	<h2 class="bp-subhead"><?php _e( 'Create A New Group','bp-nouveau' ); ?></h2>
 
 	<?php bp_nouveau_groups_create_hook( 'before', 'content_template' ); ?>
 
diff --git a/bp-templates/bp-nouveau/buddypress/groups/index.php b/bp-templates/bp-nouveau/buddypress/groups/index.php
index c08fd34..b6ca1b0 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/index.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/index.php
@@ -2,7 +2,7 @@
 /**
  * BP Nouveau - Groups Directory
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -20,10 +20,10 @@
 
 	<div class="screen-content">
 
-	<?php bp_get_template_part( 'common/search-&-filters-bar' ); ?>
+	<?php bp_get_template_part( 'common/search-and-filters-bar' ); ?>
 
 		<div id="groups-dir-list" class="groups dir-list" data-bp-list="groups">
-			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'directory-groups-loading' ) ;?></div>
+			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'directory-groups-loading' ); ?></div>
 		</div><!-- #groups-dir-list -->
 
 	<?php bp_nouveau_after_groups_directory_content(); ?>
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/activity.php b/bp-templates/bp-nouveau/buddypress/groups/single/activity.php
index 3a869de..acc0531 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/activity.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/activity.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Groups Activity
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -20,7 +20,7 @@
 			<li class="group-act-search"><?php bp_nouveau_search_form(); ?></li>
 		</ul>
 
-		<?php bp_get_template_part('common/filters/groups-screens-filters'); ?>
+		<?php bp_get_template_part( 'common/filters/groups-screens-filters' ); ?>
 	</div><!-- // .subnav-filters -->
 
 
@@ -30,7 +30,7 @@
 
 	<ul id="activity-stream" class="activity-list item-list bp-list" data-bp-list="activity">
 
-		<li id="bp-activity-ajax-loader"><?php bp_nouveau_user_feedback( 'group-activity-loading' ) ;?></li>
+		<li id="bp-activity-ajax-loader"><?php bp_nouveau_user_feedback( 'group-activity-loading' ); ?></li>
 
 	</ul>
 
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/admin.php b/bp-templates/bp-nouveau/buddypress/groups/single/admin.php
index beeaefd..7f223ff 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/admin.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/admin.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Groups Admin
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -11,7 +11,7 @@
 
 <form action="<?php bp_group_admin_form_action(); ?>" name="group-settings-form" id="group-settings-form" class="standard-form" method="post" enctype="multipart/form-data">
 
-	<?php bp_nouveau_group_manage_screen() ;?>
+	<?php bp_nouveau_group_manage_screen(); ?>
 
 </form><!-- #group-settings-form -->
 
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/admin/delete-group.php b/bp-templates/bp-nouveau/buddypress/groups/single/admin/delete-group.php
index 2f349f5..ca2faef 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/admin/delete-group.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/admin/delete-group.php
@@ -15,6 +15,6 @@
 <?php bp_nouveau_user_feedback( 'group-delete-warning' ); ?>
 
 <label for="delete-group-understand" class="bp-label-text warn">
-	<input type="checkbox" name="delete-group-understand" id="delete-group-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-group-button').disabled = ''; } else { document.getElementById('delete-group-button').disabled = 'disabled'; }" />
+	<input type="checkbox" name="delete-group-understand" id="delete-group-understand" value="1" onclick="if(this.checked) { document.getElementById( 'delete-group-button' ).disabled = ''; } else { document.getElementById( 'delete-group-button' ).disabled = 'disabled'; }" />
 	<?php _e( 'I understand the consequences of deleting this group.', 'bp-nouveau' ); ?>
 </label>
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/admin/edit-details.php b/bp-templates/bp-nouveau/buddypress/groups/single/admin/edit-details.php
index a5b581b..9458fe3 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/admin/edit-details.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/admin/edit-details.php
@@ -7,7 +7,7 @@
  * @package BP Nouveau
  */
 ?>
-<h2 class="bp-screen-title <?php if(bp_is_group_create()) echo 'creation-step-name'; ?>">
+<h2 class="bp-screen-title <?php if ( bp_is_group_create() ) { echo esc_attr( 'creation-step-name' ); } ?>">
 	<?php _e( 'Edit your groups name &amp; description', 'bp-nouveau' ); ?>
 </h2>
 
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-avatar.php b/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-avatar.php
index 37ddd85..d855b1f 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-avatar.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-avatar.php
@@ -8,12 +8,12 @@
  */
 
 ?>
-<h2 class="bp-screen-title <?php if(bp_is_group_create()) echo 'creation-step-name'; ?>">
+<h2 class="bp-screen-title <?php if ( bp_is_group_create() ) { echo esc_attr( 'creation-step-name' ); } ?>">
 	<?php _e( 'Group Avatar', 'bp-nouveau' ); ?>
 </h2>
 
-<?php if ( !bp_is_group_create() ) : ?>
-	<?php if( !bp_get_group_has_avatar() ): ?>
+<?php if ( ! bp_is_group_create() ) : ?>
+	<?php if ( ! bp_get_group_has_avatar() ): ?>
 		<p class="bp-help-text"><?php _e("Add an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'bp-nouveau' ); ?></p>
 	<?php else: ?>
 		<p class="bp-help-text"><?php _e("Edit or update your avatar image for this group.", 'bp-nouveau' ); ?></p>
@@ -21,7 +21,7 @@
 <?php endif; ?>
 
 
-<?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
+<?php if ( 'upload-image' === bp_get_avatar_admin_step() ) : ?>
 	<?php if ( bp_is_group_create() ) : ?>
 
 
@@ -59,7 +59,7 @@
 	/**
 	 * Load the Avatar UI templates
 	 *
-	 * @since  2.3.0
+	 * @since 2.3.0
 	 */
 	bp_avatar_get_templates(); ?>
 
@@ -67,7 +67,7 @@
 
 <?php endif;
 
-if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
+if ( 'crop-image' === bp_get_avatar_admin_step() ) : ?>
 
 	<h4><?php _e( 'Crop Group Profile Photo', 'bp-nouveau' ); ?></h4>
 
@@ -85,6 +85,10 @@
 	<input type="hidden" id="w" name="w" />
 	<input type="hidden" id="h" name="h" />
 
-	<?php if ( ! bp_is_group_create() ) wp_nonce_field( 'bp_avatar_cropstore' ); ?>
+	<?php
+	if ( ! bp_is_group_create() ) {
+		wp_nonce_field( 'bp_avatar_cropstore' );
+	}
+	?>
 
 <?php endif;
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-cover-image.php b/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-cover-image.php
index 42eac36..7be7120 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-cover-image.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-cover-image.php
@@ -10,7 +10,7 @@
 
 <?php if ( bp_is_group_create() ) : ?>
 
-	<h2 class="bp-screen-title <?php if(bp_is_group_create()) echo 'creation-step-name'; ?>">
+	<h2 class="bp-screen-title <?php if ( bp_is_group_create() ) { echo esc_attr( 'creation-step-name' ); } ?>">
 		<?php _e( 'Upload a Cover Image', 'bp-nouveau' ); ?>
 	</h2>
 
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-settings.php b/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-settings.php
index 7ef9135..ba665f3 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-settings.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/admin/group-settings.php
@@ -8,7 +8,7 @@
  */
 ?>
 
-<h2 class="bp-screen-title <?php if(bp_is_group_create()) echo 'creation-step-name'; ?>">
+<h2 class="bp-screen-title <?php if ( bp_is_group_create() ) : ?>creation-step-name<?php endif; ?>">
 	<?php _e( 'Group Settings', 'bp-nouveau' ); ?>
 </h2>
 
@@ -21,7 +21,7 @@
 			<legend><?php _e( 'Public Group Option', 'bp-nouveau' ); ?></legend>
 
 			<dl class="group-conditions">
-				<dt><?php _e('Public Groups Conditions', 'bp-nouveau'); ?> </dt>
+				<dt><?php _e( 'Public Groups Conditions', 'bp-nouveau' ); ?> </dt>
 				<dd>
 					<ul id="public-group-description">
 						<li><?php _e( 'Any site member can join this group.', 'bp-nouveau' ); ?></li>
@@ -32,7 +32,7 @@
 			</dl>
 
 			<label for="group-status-public">
-				<input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' == bp_get_new_group_status() || !bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php _e( 'This is a public group', 'bp-nouveau' ); ?>
+				<input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' === bp_get_new_group_status() || ! bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php _e( 'This is a public group', 'bp-nouveau' ); ?>
 			</label>
 
 		</fieldset>
@@ -41,7 +41,7 @@
 			<legend><?php _e( 'Private Group Option', 'bp-nouveau' ); ?></legend>
 
 			<dl class="group-conditions">
-				<dt><?php _e('Private Groups Conditions', 'bp-nouveau'); ?> </dt>
+				<dt><?php _e( 'Private Groups Conditions', 'bp-nouveau' ); ?> </dt>
 				<dd>
 					<ul id="private-group-description">
 						<li><?php _e( 'Only users who request membership and are accepted can join the group.', 'bp-nouveau' ); ?></li>
@@ -52,7 +52,7 @@
 			</dl>
 
 			<label for="group-status-private">
-				<input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php _e( 'This is a private group', 'bp-nouveau' ); ?>
+				<input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' === bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php _e( 'This is a private group', 'bp-nouveau' ); ?>
 			</label>
 
 		</fieldset>
@@ -61,7 +61,7 @@
 			<legend><?php _e( 'Hidden Group Option', 'bp-nouveau' ); ?></legend>
 
 			<dl class="group-conditions">
-				<dt><?php _e('Hidden Groups Conditions', 'bp-nouveau'); ?> </dt>
+				<dt><?php _e( 'Hidden Groups Conditions', 'bp-nouveau' ); ?> </dt>
 				<dd>
 					<ul id="hidden-group-description">
 						<li><?php _e( 'Only users who are invited can join the group.', 'bp-nouveau' ); ?></li>
@@ -72,7 +72,7 @@
 			</dl>
 
 			<label for="group-status-hidden">
-				<input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php _e('This is a hidden group', 'bp-nouveau' ); ?>
+				<input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' === bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php _e( 'This is a hidden group', 'bp-nouveau' ); ?>
 			</label>
 
 		</fieldset>
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/admin/manage-members.php b/bp-templates/bp-nouveau/buddypress/groups/single/admin/manage-members.php
index 2605394..4abfbf8 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/admin/manage-members.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/admin/manage-members.php
@@ -8,11 +8,11 @@
  */
 ?>
 
-<h2 class="bp-screen-title <?php if(bp_is_group_create()) echo 'creation-step-name'; ?>">
+<h2 class="bp-screen-title <?php if ( bp_is_group_create() ) { echo esc_attr( 'creation-step-name' ); } ?>">
 	<?php _e( 'Manage Group Members', 'bp-nouveau' ); ?>
 </h2>
 
-	<p class="bp-help-text"><?php _e('Manage your group members; promote to moderators, admins or demote or ban.', 'bp-nouveau'); ?></p>
+	<p class="bp-help-text"><?php _e( 'Manage your group members; promote to moderators, admins or demote or ban.', 'bp-nouveau' ); ?></p>
 
 	<dl class="groups-manage-members-list">
 
@@ -99,7 +99,7 @@
 							<span class="banned warn"><?php if ( bp_get_group_member_is_banned() ) _e( '(banned)', 'bp-nouveau' ); ?></span>
 						</p>
 
-						<?php bp_nouveau_groups_manage_members_buttons( array('container' => 'p', 'container_classes' => array('group-manage-buttons', 'text-links-list'), 'parent_element' => '  ' ) ) ; ?>
+						<?php bp_nouveau_groups_manage_members_buttons( array( 'container' => 'p', 'container_classes' => array( 'group-manage-buttons', 'text-links-list' ), 'parent_element' => '  ' ) ) ; ?>
 
 					</li>
 
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/admin/membership-requests.php b/bp-templates/bp-nouveau/buddypress/groups/single/admin/membership-requests.php
index 6f2a178..6e245a4 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/admin/membership-requests.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/admin/membership-requests.php
@@ -10,6 +10,6 @@
 
 <div class="requests" data-bp-list="group_requests">
 
-	<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'group-requests-loading' ) ;?></div>
+	<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'group-requests-loading' ); ?></div>
 
 </div><!-- .requests -->
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php b/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php
index 3aaeb4c..b136801 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Groups Cover Image Header.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -46,7 +46,7 @@
 		</div><!-- #item-header-content -->
 <?php endif; ?>
 
-		<?php bp_get_template_part('groups/single/parts/header-item-actions'); ?>
+		<?php bp_get_template_part( 'groups/single/parts/header-item-actions' ); ?>
 
 	</div><!-- #item-header-cover-image -->
 
@@ -54,7 +54,7 @@
 </div><!-- #cover-image-container -->
 
 <?php	if ( ! bp_nouveau_groups_front_page_description() ) : ?>
-<?php if( bp_nouveau_group_meta()->description ) { ?>
+<?php if ( bp_nouveau_group_meta()->description ) { ?>
 	<div class="desc-wrap">
 		<div class="group-description">
 		<?php echo bp_nouveau_group_meta()->description; ?>
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/default-front.php b/bp-templates/bp-nouveau/buddypress/groups/single/default-front.php
index dc07fc5..1fae0d6 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/default-front.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/default-front.php
@@ -12,7 +12,7 @@
 	<?php if ( ! is_customize_preview() && bp_current_user_can( 'bp_moderate' ) ) : ?>
 
 		<div class="bp-feedback custom-homepage-info info no-icon">
-			<strong><?php esc_html_e( 'Manage the Groups default front page', 'bp-nouveau' ) ;?></strong>
+			<strong><?php esc_html_e( 'Manage the Groups default front page', 'bp-nouveau' ); ?></strong>
 
 			<p>
 			<?php printf(
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php b/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php
index 3c63189..1e8f3a7 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php
@@ -2,13 +2,13 @@
 /**
  * BuddyPress - Groups Header
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
 ?>
 
-<?php bp_get_template_part('groups/single/parts/header-item-actions'); ?>
+<?php bp_get_template_part( 'groups/single/parts/header-item-actions' ); ?>
 
 <?php if ( ! bp_disable_group_avatar_uploads() ) : ?>
 	<div id="item-header-avatar">
@@ -34,7 +34,7 @@
 		</div><!-- .item-meta -->
 	<?php endif; ?>
 
-	<?php if( bp_nouveau_group_meta()->description ) { ?>
+	<?php if ( bp_nouveau_group_meta()->description ) { ?>
 		<div class="group-description">
 			<?php echo bp_nouveau_group_meta()->description; ?>
 		</div><!-- //.group_description -->
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/home.php b/bp-templates/bp-nouveau/buddypress/groups/single/home.php
index 56c25e1..de122db 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/home.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/home.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Groups Home
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/members-loop.php b/bp-templates/bp-nouveau/buddypress/groups/single/members-loop.php
index 2b49425..756d126 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/members-loop.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/members-loop.php
@@ -2,7 +2,7 @@
 /**
  * Group Members Loop template
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -20,7 +20,7 @@
 
 		<?php while ( bp_group_members() ) : bp_group_the_member(); ?>
 
-			<li <?php bp_member_class( array('item-entry') ); ?> data-bp-item-id="<?php echo esc_attr( bp_get_group_member_id() ); ?>" data-bp-item-component="members">
+			<li <?php bp_member_class( array( 'item-entry' ) ); ?> data-bp-item-id="<?php echo esc_attr( bp_get_group_member_id() ); ?>" data-bp-item-component="members">
 
 				<div class="list-wrap">
 					<div class="item-avatar">
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/members.php b/bp-templates/bp-nouveau/buddypress/groups/single/members.php
index 3864b83..1146ce2 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/members.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/members.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Groups Members
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -13,13 +13,13 @@
 
 			<?php bp_nouveau_search_form(); ?>
 
-		<?php bp_get_template_part('common/filters/groups-screens-filters'); ?>
+		<?php bp_get_template_part( 'common/filters/groups-screens-filters' ); ?>
 
 	</div>
 
 
 <div id="members-group-list" class="group_members dir-list" data-bp-list="group_members">
 
-	<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'group-members-loading' ) ;?></div>
+	<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'group-members-loading' ); ?></div>
 
 </div><!-- .group_members.dir-list -->
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/parts/header-item-actions.php b/bp-templates/bp-nouveau/buddypress/groups/single/parts/header-item-actions.php
index fdeaf65..ca26e33 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/parts/header-item-actions.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/parts/header-item-actions.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Groups Header item-actions.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/parts/item-nav.php b/bp-templates/bp-nouveau/buddypress/groups/single/parts/item-nav.php
index 5e04bb2..4d2968e 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/parts/item-nav.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/parts/item-nav.php
@@ -28,7 +28,7 @@
 
 				<?php endwhile; ?>
 
-				<?php bp_nouveau_group_hook( '', 'options_nav' ) ;?>
+				<?php bp_nouveau_group_hook( '', 'options_nav' ); ?>
 
 			</ul>
 
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/plugins.php b/bp-templates/bp-nouveau/buddypress/groups/single/plugins.php
index 2c5a12f..93145f8 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/plugins.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/plugins.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Groups plugins
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/request-membership.php b/bp-templates/bp-nouveau/buddypress/groups/single/request-membership.php
index 89df4fd..9fb7cae 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/request-membership.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/request-membership.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Groups Request Membership
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -12,7 +12,7 @@
 <?php if ( ! bp_group_has_requested_membership() ) : ?>
 	<p><?php printf( __( 'You are requesting to become a member of the group \'%s\'.', 'bp-nouveau' ), bp_get_group_name( false ) ); ?></p>
 
-	<form action="<?php bp_group_form_action('request-membership' ); ?>" method="post" name="request-membership-form" id="request-membership-form" class="standard-form">
+	<form action="<?php bp_group_form_action( 'request-membership' ); ?>" method="post" name="request-membership-form" id="request-membership-form" class="standard-form">
 		<label for="group-request-membership-comments"><?php _e( 'Comments (optional)', 'bp-nouveau' ); ?></label>
 		<textarea name="group-request-membership-comments" id="group-request-membership-comments"></textarea>
 
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/requests-loop.php b/bp-templates/bp-nouveau/buddypress/groups/single/requests-loop.php
index 8293b04..571e227 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/requests-loop.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/requests-loop.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Groups Requests Loop
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
diff --git a/bp-templates/bp-nouveau/buddypress/groups/single/send-invites.php b/bp-templates/bp-nouveau/buddypress/groups/single/send-invites.php
index 2e59292..ff41f21 100644
--- a/bp-templates/bp-nouveau/buddypress/groups/single/send-invites.php
+++ b/bp-templates/bp-nouveau/buddypress/groups/single/send-invites.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Groups Send Invites
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
diff --git a/bp-templates/bp-nouveau/buddypress/members/index.php b/bp-templates/bp-nouveau/buddypress/members/index.php
index 5a5382a..4a45956 100644
--- a/bp-templates/bp-nouveau/buddypress/members/index.php
+++ b/bp-templates/bp-nouveau/buddypress/members/index.php
@@ -19,10 +19,10 @@
 
 	<div class="screen-content">
 
-	<?php bp_get_template_part( 'common/search-&-filters-bar' ); ?>
+	<?php bp_get_template_part( 'common/search-and-filters-bar' ); ?>
 
 		<div id="members-dir-list" class="members dir-list" data-bp-list="members">
-			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'directory-members-loading' ) ;?></div>
+			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'directory-members-loading' ); ?></div>
 		</div><!-- #members-dir-list -->
 
 		<?php bp_nouveau_after_members_directory_content() ?>
diff --git a/bp-templates/bp-nouveau/buddypress/members/members-loop.php b/bp-templates/bp-nouveau/buddypress/members/members-loop.php
index 7098045..8877221 100644
--- a/bp-templates/bp-nouveau/buddypress/members/members-loop.php
+++ b/bp-templates/bp-nouveau/buddypress/members/members-loop.php
@@ -4,7 +4,7 @@
  *
  * Querystring is set via AJAX in _inc/ajax.php - bp_legacy_theme_object_filter()
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -23,7 +23,7 @@
 
 	<?php while ( bp_members() ) : bp_the_member(); ?>
 
-		<li <?php bp_member_class( array('item-entry') ); ?> data-bp-item-id="<?php bp_member_user_id(); ?>" data-bp-item-component="members">
+		<li <?php bp_member_class( array( 'item-entry' ) ); ?> data-bp-item-id="<?php bp_member_user_id(); ?>" data-bp-item-component="members">
 			<div class="list-wrap">
 
 				<div class="item-avatar">
@@ -44,7 +44,7 @@
 							</p><!-- #item-meta -->
 						<?php endif ; ?>
 
-						<?php bp_nouveau_members_loop_buttons( array('container' => 'ul', 'button_element' => 'button' ) ); ?>
+						<?php bp_nouveau_members_loop_buttons( array( 'container' => 'ul', 'button_element' => 'button' ) ); ?>
 
 					</div>
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/register.php b/bp-templates/bp-nouveau/buddypress/members/register.php
index e992a7c..5e92223 100644
--- a/bp-templates/bp-nouveau/buddypress/members/register.php
+++ b/bp-templates/bp-nouveau/buddypress/members/register.php
@@ -21,7 +21,7 @@
 
 			<div class="layout-wrap">
 
-			<?php if ( 'request-details' == bp_get_current_signup_step() ) : ?>
+			<?php if ( 'request-details' === bp_get_current_signup_step() ) : ?>
 
 				<?php bp_nouveau_signup_hook( 'before', 'account_details' ); ?>
 
@@ -61,7 +61,7 @@
 									bp_nouveau_xprofile_edit_visibilty();
 									?>
 
-									<?php if( bp_get_the_profile_field_description() ) : ?>
+									<?php if ( bp_get_the_profile_field_description() ) : ?>
 									<p class="description bp-feedback info small">
 										<span class="bp-icon" aria-hidden="true"></span>
 										<span class="text"><?php bp_the_profile_field_description(); ?></span>
@@ -94,7 +94,7 @@
 
 						<h2><?php _e( 'Blog Details', 'bp-nouveau' ); ?></h2>
 
-						<p><label for="signup_with_blog"><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes, I\'d like to create a new site', 'bp-nouveau' ); ?></label></p>
+						<p><label for="signup_with_blog"><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1" <?php checked( (int) bp_get_signup_with_blog_value(), 1 ); ?>/> <?php _e( "Yes, I'd like to create a new site", 'bp-nouveau' ); ?></label></p>
 
 						<div id="blog-details"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?>class="show"<?php endif; ?>>
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/activity.php b/bp-templates/bp-nouveau/buddypress/members/single/activity.php
index 87ebaf0..147a95c 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/activity.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/activity.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Users Activity
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -17,10 +17,10 @@
 	</ul>
 </nav><!-- .item-list-tabs#subnav -->
 
-<?php bp_nouveau_activity_member_post_form() ;?>
+<?php bp_nouveau_activity_member_post_form(); ?>
 
 
-<?php bp_get_template_part( 'common/search-&-filters-bar' ); ?>
+<?php bp_get_template_part( 'common/search-and-filters-bar' ); ?>
 
 <?php bp_nouveau_member_hook( 'before', 'activity_content' ); ?>
 
@@ -28,7 +28,7 @@
 
 	<ul id="activity-stream" class="<?php bp_nouveau_loop_classes(); ?>" data-bp-list="activity">
 
-		<li id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-activity-loading' ) ;?></li>
+		<li id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-activity-loading' ); ?></li>
 
 	</ul>
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/blogs.php b/bp-templates/bp-nouveau/buddypress/members/single/blogs.php
index 61cd5a6..1c89f37 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/blogs.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/blogs.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Users Blogs
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -17,7 +17,7 @@
 	</ul>
 </nav><!-- .bp-navs -->
 
-<?php bp_get_template_part( 'common/search-&-filters-bar' ); ?>
+<?php bp_get_template_part( 'common/search-and-filters-bar' ); ?>
 
 <?php
 switch ( bp_current_action() ) :
@@ -29,7 +29,7 @@
 
 		<div class="blogs myblogs" data-bp-list="blogs">
 
-			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-blogs-loading' ) ;?></div>
+			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-blogs-loading' ); ?></div>
 
 		</div><!-- .blogs.myblogs -->
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/cover-image-header.php b/bp-templates/bp-nouveau/buddypress/members/single/cover-image-header.php
index 40ccd8b..c9551bf 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/cover-image-header.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/cover-image-header.php
@@ -26,7 +26,7 @@
 				<h2 class="user-nicename">@<?php bp_displayed_user_mentionname(); ?></h2>
 			<?php endif; ?>
 
-			<?php bp_nouveau_member_header_buttons( array('container' => 'ul', 'button_element' => 'button', 'container_classes' => array('member-header-actions') ) ); ?>
+			<?php bp_nouveau_member_header_buttons( array( 'container' => 'ul', 'button_element' => 'button', 'container_classes' => array( 'member-header-actions' ) ) ); ?>
 
 			<?php bp_nouveau_member_hook( 'before', 'header_meta' ); ?>
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/default-front.php b/bp-templates/bp-nouveau/buddypress/members/single/default-front.php
index dbfc106..4fdfe21 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/default-front.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/default-front.php
@@ -13,7 +13,7 @@
 	<?php if ( ! is_customize_preview() && bp_current_user_can( 'bp_moderate' ) && ! is_active_sidebar( 'sidebar-buddypress-members' ) ) : ?>
 
 		<div class="bp-feedback custom-homepage-info info">
-			<strong><?php esc_html_e( 'Manage the members default front page', 'bp-nouveau' ) ;?></strong>
+			<strong><?php esc_html_e( 'Manage the members default front page', 'bp-nouveau' ); ?></strong>
 			<button type="button" class="bp-tooltips" data-bp-tooltips="<?php esc_attr_e( 'Close', 'bp-nouveau' ); ?>" aria-label="<?php esc_attr_e( 'Close this notice', 'bp-nouveau' ); ?>" data-bp-close="remove"><span class="dashicons dashicons-dismiss" aria-hidden="true"></span></button><br/>
 			<?php printf(
 				esc_html__( 'You can set the preferences of the %s or add %s to it.', 'bp-nouveau' ),
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/friends.php b/bp-templates/bp-nouveau/buddypress/members/single/friends.php
index 1474caa..6ea0962 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/friends.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/friends.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Users Friends
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -19,7 +19,7 @@
 	</ul>
 </nav><!-- .bp-navs -->
 
-<?php bp_get_template_part( 'common/search-&-filters-bar' ); ?>
+<?php bp_get_template_part( 'common/search-and-filters-bar' ); ?>
 
 <?php
 switch ( bp_current_action() ) :
@@ -31,7 +31,7 @@
 
 		<div class="members friends" data-bp-list="members">
 
-			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-friends-loading' ) ;?></div>
+			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-friends-loading' ); ?></div>
 
 		</div><!-- .members.friends -->
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/friends/requests.php b/bp-templates/bp-nouveau/buddypress/members/single/friends/requests.php
index c38e8c3..459fc38 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/friends/requests.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/friends/requests.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Friends Requests
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -13,10 +13,10 @@
 
 	<?php bp_nouveau_pagination( 'top' ); ?>
 
-	<ul id="friend-list" class="<?php bp_nouveau_loop_classes(); ?>"  data-bp-list="friendship_requests">
+	<ul id="friend-list" class="<?php bp_nouveau_loop_classes(); ?>" data-bp-list="friendship_requests">
 		<?php while ( bp_members() ) : bp_the_member(); ?>
 
-			<li id="friendship-<?php bp_friend_friendship_id(); ?>" <?php bp_member_class( array('item-entry') ); ?> data-bp-item-id="<?php bp_friend_friendship_id(); ?>" data-bp-item-component="members">
+			<li id="friendship-<?php bp_friend_friendship_id(); ?>" <?php bp_member_class( array( 'item-entry' ) ); ?> data-bp-item-id="<?php bp_friend_friendship_id(); ?>" data-bp-item-component="members">
 				<div class="item-avatar">
 					<a href="<?php bp_member_link(); ?>"><?php bp_member_avatar(); ?></a>
 				</div>
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/groups.php b/bp-templates/bp-nouveau/buddypress/members/single/groups.php
index 8bcfbae..decd2cc 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/groups.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/groups.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Users Groups
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -24,7 +24,7 @@
 <?php if ( ! bp_is_current_action( 'invites' ) ) : ?>
 
 
-	<?php bp_get_template_part( 'common/search-&-filters-bar' ); ?>
+	<?php bp_get_template_part( 'common/search-and-filters-bar' ); ?>
 
 <?php endif; ?>
 
@@ -39,7 +39,7 @@
 
 		<div class="groups mygroups" data-bp-list="groups">
 
-			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-groups-loading' ) ;?></div>
+			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-groups-loading' ); ?></div>
 
 		</div>
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/groups/invites.php b/bp-templates/bp-nouveau/buddypress/members/single/groups/invites.php
index 7445c37..b3e67a8 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/groups/invites.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/groups/invites.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Single Group Invites
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -37,7 +37,7 @@
 
 						<?php bp_nouveau_group_hook( '', 'invites_item' ); ?>
 
-						<?php bp_nouveau_groups_invite_buttons( array('container' => 'ul', 'button_element' => 'button' ) ); ?>
+						<?php bp_nouveau_groups_invite_buttons( array( 'container' => 'ul', 'button_element' => 'button' ) ); ?>
 					</div>
 
 				</div>
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/home.php b/bp-templates/bp-nouveau/buddypress/members/single/home.php
index 9b689b6..e338592 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/home.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/home.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Home
  *
- * @since    1.0.0
+ * @since   1.0.0
  *
  * @package BP Nouveau
  */
@@ -11,9 +11,9 @@
 
 	<?php bp_nouveau_member_hook( 'before', 'home_content' ); ?>
 
-	<div id="item-header" role="complementary" data-bp-item-id="<?php echo bp_displayed_user_id(); ?>" data-bp-item-component="members" class="users-header single-headers">
+	<div id="item-header" role="complementary" data-bp-item-id="<?php echo esc_attr( bp_displayed_user_id() ); ?>" data-bp-item-component="members" class="users-header single-headers">
 
-		<?php bp_nouveau_member_header_template_part() ;?>
+		<?php bp_nouveau_member_header_template_part(); ?>
 
 	</div><!-- #item-header -->
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/member-header.php b/bp-templates/bp-nouveau/buddypress/members/single/member-header.php
index 1508fe4..a994516 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/member-header.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/member-header.php
@@ -33,5 +33,5 @@
 		</div><!-- #item-meta -->
 	<?php endif ; ?>
 
-	<?php bp_nouveau_member_header_buttons( array('container_classes' => array('member-header-actions') ) ); ?>
+	<?php bp_nouveau_member_header_buttons( array( 'container_classes' => array( 'member-header-actions' ) ) ); ?>
 </div><!-- #item-header-content -->
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/messages.php b/bp-templates/bp-nouveau/buddypress/members/single/messages.php
index 002554d..ee23f22 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/messages.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/messages.php
@@ -16,7 +16,7 @@
 	</ul>
 </nav><!-- .bp-navs -->
 
-<?php if ( ! in_array( bp_current_action(), array( 'inbox', 'sentbox', 'starred', 'view', 'compose', 'notices' ) ) ) :
+<?php if ( ! in_array( bp_current_action(), array( 'inbox', 'sentbox', 'starred', 'view', 'compose', 'notices' ), true ) ) :
 
 	bp_get_template_part( 'members/single/plugins' );
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/notifications.php b/bp-templates/bp-nouveau/buddypress/members/single/notifications.php
index 09c4f06..1b465a4 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/notifications.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/notifications.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Users Notifications
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -24,11 +24,11 @@
 	case 'read'   : ?>
 
 
-	<?php bp_get_template_part( 'common/search-&-filters-bar' ); ?>
+	<?php bp_get_template_part( 'common/search-and-filters-bar' ); ?>
 
 
 		<div id="notifications-user-list" class="notifications dir-list" data-bp-list="notifications">
-			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-notifications-loading' ) ;?></div>
+			<div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-notifications-loading' ); ?></div>
 		</div><!-- #groups-dir-list -->
 
 		<?php
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/notifications/notifications-loop.php b/bp-templates/bp-nouveau/buddypress/members/single/notifications/notifications-loop.php
index 4c9ea13..7376b34 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/notifications/notifications-loop.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/notifications/notifications-loop.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Notifications Loop
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -20,7 +20,7 @@
 					<th class="title"><?php _e( 'Notification', 'bp-nouveau' ); ?></th>
 					<th class="date">
 						<?php _e( 'Date Received', 'bp-nouveau' ); ?>
-						<?php bp_nouveau_notifications_sort_order_links() ;?>
+						<?php bp_nouveau_notifications_sort_order_links(); ?>
 					</th>
 					<th class="actions"><?php _e( 'Actions', 'bp-nouveau' ); ?></th>
 				</tr>
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/parts/item-nav.php b/bp-templates/bp-nouveau/buddypress/members/single/parts/item-nav.php
index 7a14c52..da368f9 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/parts/item-nav.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/parts/item-nav.php
@@ -28,7 +28,7 @@
 
 				<?php endwhile; ?>
 
-				<?php bp_nouveau_member_hook( '', 'options_nav' ) ;?>
+				<?php bp_nouveau_member_hook( '', 'options_nav' ); ?>
 
 			</ul>
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/parts/profile-visibility.php b/bp-templates/bp-nouveau/buddypress/members/single/parts/profile-visibility.php
index 63f62f1..20949a3 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/parts/profile-visibility.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/parts/profile-visibility.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Single Profile Edit Field visibility
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/plugins.php b/bp-templates/bp-nouveau/buddypress/members/single/plugins.php
index 1befbbc..b1a94bd 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/plugins.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/plugins.php
@@ -5,7 +5,7 @@
  * 3rd-party plugins should use this template to easily add template
  * support to their plugins for the members component.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/profile/change-avatar.php b/bp-templates/bp-nouveau/buddypress/members/single/profile/change-avatar.php
index 593ae68..b70f5ea 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/profile/change-avatar.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/profile/change-avatar.php
@@ -6,26 +6,25 @@
  *
  * @package BP Nouveau
  */
-
 ?>
 
 <h2 class="screen-heading"><?php _e( 'Change Profile Photo', 'bp-nouveau' ); ?></h2>
 
 <?php bp_nouveau_xprofile_hook( 'before', 'avatar_upload_content' ); ?>
 
-<?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
+<?php if ( ! (int) bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
 
 	<p class="bp-feedback info">
 		<span class="bp-icon" aria-hidden="true"></span>
-		<span class="bp-help-text"><?php _e( 'Your profile photo will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'bp-nouveau' ); ?></span>
+		<span class="bp-help-text"><?php _e( 'Your profile photo will be used on your profile and throughout the site. If there is a <a href="https://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'bp-nouveau' ); ?></span>
 	</p>
 
 	<form action="" method="post" id="avatar-upload-form" class="standard-form" enctype="multipart/form-data">
 
-		<?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
+		<?php if ( 'upload-image' === bp_get_avatar_admin_step() ) : ?>
 
 			<?php wp_nonce_field( 'bp_avatar_upload' ); ?>
-			<p class="bp-help-text"><?php _e( 'Click below to select a JPG, GIF or PNG format photo from your computer and then click \'Upload Image\' to proceed.', 'bp-nouveau' ); ?></p>
+			<p class="bp-help-text"><?php _e( "Click below to select a JPG, GIF or PNG format photo from your computer and then click 'Upload Image' to proceed.", 'bp-nouveau' ); ?></p>
 
 			<p id="avatar-upload">
 				<label for="file" class="bp-screen-reader-text"><?php _e( 'Select an image', 'bp-nouveau' ); ?></label>
@@ -41,7 +40,7 @@
 
 		<?php endif; ?>
 
-		<?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
+		<?php if ( 'crop-image' === bp_get_avatar_admin_step() ) : ?>
 
 			<p class="bp-help-text screen-header"><?php _e( 'Crop Your New Profile Photo', 'bp-nouveau' ); ?></p>
 
@@ -69,13 +68,13 @@
 	/**
 	 * Load the Avatar UI templates
 	 *
-	 * @since  2.3.0
+	 * @since 2.3.0
 	 */
 	bp_avatar_get_templates(); ?>
 
 <?php else : ?>
 
-	<p class="bp-help-text"><?php _e( 'Your profile photo will be used on your profile and throughout the site. To change your profile photo, please create an account with <a href="http://gravatar.com">Gravatar</a> using the same email address as you used to register with this site.', 'bp-nouveau' ); ?></p>
+	<p class="bp-help-text"><?php _e( 'Your profile photo will be used on your profile and throughout the site. To change your profile photo, please create an account with <a href="https://gravatar.com">Gravatar</a> using the same email address as you used to register with this site.', 'bp-nouveau' ); ?></p>
 
 <?php endif; ?>
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/profile/edit.php b/bp-templates/bp-nouveau/buddypress/members/single/profile/edit.php
index 3572d63..73c6b81 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/profile/edit.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/profile/edit.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Single Profile Edit
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -30,7 +30,7 @@
 
 			<div<?php bp_field_css_class( 'editfield' ); ?>>
 
-			<?php if( bp_get_the_profile_field_description() ) : ?>
+			<?php if ( bp_get_the_profile_field_description() ) : ?>
 				<div class="bp-feedback bp-mesages info description">
 					<span class="bp-icon" aria-hidden="true"></span>
 					<p class="text">
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/settings/capabilities.php b/bp-templates/bp-nouveau/buddypress/members/single/settings/capabilities.php
index 971718f..b625372 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/settings/capabilities.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/settings/capabilities.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Settings ( Capabilities )
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -10,10 +10,10 @@
 bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
 
 <h2 class="screen-heading member-capabilities-screen">
-	<?php _e('Members Capabilities', 'bp-nouveau'); ?>
+	<?php _e( 'Members Capabilities', 'bp-nouveau' ); ?>
 </h2>
 
-<form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/capabilities/'; ?>" name="account-capabilities-form" id="account-capabilities-form" class="standard-form" method="post">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/capabilities/' ); ?>" name="account-capabilities-form" id="account-capabilities-form" class="standard-form" method="post">
 
 	<label for="user-spammer">
 		<input type="checkbox" name="user-spammer" id="user-spammer" value="1" <?php checked( bp_is_user_spammer( bp_displayed_user_id() ) ); ?> />
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php b/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php
index 92051d1..9701d0d 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/settings/delete-account.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Settings ( Delete Account )
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -10,15 +10,15 @@
 bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
 
 <h2 class="screen-heading delete-account-screen warn">
-	<?php _e('Delete Account', 'bp-nouveau'); ?>
+	<?php _e( 'Delete Account', 'bp-nouveau' ); ?>
 </h2>
 
 <?php bp_nouveau_user_feedback( 'member-delete-account' ); ?>
 
-<form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account' ); ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
 
 	<label class="warn" for="delete-account-understand">
-		<input type="checkbox" name="delete-account-understand" id="delete-account-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-account-button').disabled = ''; } else { document.getElementById('delete-account-button').disabled = 'disabled'; }" />
+		<input type="checkbox" name="delete-account-understand" id="delete-account-understand" value="1" onclick="if(this.checked) { document.getElementById( 'delete-account-button' ).disabled = ''; } else { document.getElementById( 'delete-account-button' ).disabled = 'disabled'; }" />
 		 <?php _e( 'I understand the consequences.', 'bp-nouveau' ); ?>
 	</label>
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/settings/general.php b/bp-templates/bp-nouveau/buddypress/members/single/settings/general.php
index deb8ceb..e1c09bf 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/settings/general.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/settings/general.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Settings ( General )
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -10,31 +10,31 @@
 bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
 
 <h2 class="screen-heading genaral-settings-screen">
-	<?php _e('Email & Password', 'bp-nouveau'); ?>
+	<?php _e( 'Email & Password', 'bp-nouveau' ); ?>
 </h2>
 
 <p class="info email-pwd-info">
 	<?php _e( 'Update your email and or password.', 'bp-nouveau' ); ?>
 </p>
 
-<form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/general'; ?>" method="post" class="standard-form" id="settings-form">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/general' ); ?>" method="post" class="standard-form" id="settings-form">
 
-	<?php if ( !is_super_admin() ) : ?>
+	<?php if ( ! is_super_admin() ) : ?>
 
 		<label for="pwd"><?php _e( 'Current Password <span>(required to update email or change current password)</span>', 'bp-nouveau' ); ?></label>
-		<input type="password" name="pwd" id="pwd" size="16" value="" class="settings-input small" <?php bp_form_field_attributes( 'password' ); ?>/> &nbsp;<a href="<?php echo wp_lostpassword_url(); ?>"><?php _e( 'Lost your password?', 'bp-nouveau' ); ?></a>
+		<input type="password" name="pwd" id="pwd" size="16" value="" class="settings-input small" <?php bp_form_field_attributes( 'password' ); ?>/> &nbsp;<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?', 'bp-nouveau' ); ?></a>
 
 	<?php endif; ?>
 
 	<label for="email"><?php _e( 'Account Email', 'bp-nouveau' ); ?></label>
-	<input type="email" name="email" id="email" value="<?php echo bp_get_displayed_user_email(); ?>" class="settings-input" <?php bp_form_field_attributes( 'email' ); ?>/>
+	<input type="email" name="email" id="email" value="<?php echo esc_attr( bp_get_displayed_user_email() ); ?>" class="settings-input" <?php bp_form_field_attributes( 'email' ); ?>/>
 
 	<div class="info bp-feedback">
 		<span class="bp-icon" aria-hidden="true"></span>
 		<p class="text"><?php _e( 'Leave password fields blank for no change', 'bp-nouveau' ); ?></p>
 	</div>
 
-	<label for="pass1"><?php _e('Add Your New Password', 'bp-nouveau'); ?></label>
+	<label for="pass1"><?php _e( 'Add Your New Password', 'bp-nouveau' ); ?></label>
 	<input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small password-entry" <?php bp_form_field_attributes( 'password' ); ?>/>
 
 	<label for="pass2" class="repeated-pwd"><?php _e( 'Repeat Your New Password', 'bp-nouveau' ); ?></label>
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/settings/group-invites.php b/bp-templates/bp-nouveau/buddypress/members/single/settings/group-invites.php
index 33bd73c..34c4ec6 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/settings/group-invites.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/settings/group-invites.php
@@ -2,19 +2,19 @@
 /**
  * BuddyPress - Members Settings ( Group Invites )
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
 ?>
 
 <h2 class="screen-heading group-invites-screen">
-	<?php _e('Group Invites', 'bp-nouveau'); ?>
+	<?php _e( 'Group Invites', 'bp-nouveau' ); ?>
 </h2>
 
 <?php bp_nouveau_user_feedback( 'member-group-invites' ); ?>
 
-<form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/invites/'; ?>" name="account-group-invites-form" id="account-group-invites-form" class="standard-form" method="post">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/invites/' ); ?>" name="account-group-invites-form" id="account-group-invites-form" class="standard-form" method="post">
 
 	<label for="account-group-invites-preferences">
 		<input type="checkbox" name="account-group-invites-preferences" id="account-group-invites-preferences" value="1" <?php checked( 1, bp_nouveau_groups_get_group_invites_setting() ); ?>/>
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/settings/notifications.php b/bp-templates/bp-nouveau/buddypress/members/single/settings/notifications.php
index 4bab80d..ea8f816 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/settings/notifications.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/settings/notifications.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Settings ( Notifications )
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -10,14 +10,14 @@
 bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
 
 <h2 class="screen-heading email-settings-screen">
-	<?php _e('Email Notifications', 'bp-nouveau'); ?>
+	<?php _e( 'Email Notifications', 'bp-nouveau' ); ?>
 </h2>
 
 <p class="bp-help-text email-notifications-info">
 	<?php _e( 'Set your email notification preferences.', 'bp-nouveau' ); ?>
 </p>
 
-<form action="<?php echo bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications'; ?>" method="post" class="standard-form" id="settings-form">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications' ); ?>" method="post" class="standard-form" id="settings-form">
 
 	<?php bp_nouveau_member_email_notice_settings() ; ?>
 
diff --git a/bp-templates/bp-nouveau/buddypress/members/single/settings/profile.php b/bp-templates/bp-nouveau/buddypress/members/single/settings/profile.php
index b6371bb..473fc69 100644
--- a/bp-templates/bp-nouveau/buddypress/members/single/settings/profile.php
+++ b/bp-templates/bp-nouveau/buddypress/members/single/settings/profile.php
@@ -2,7 +2,7 @@
 /**
  * BuddyPress - Members Settings ( Profile )
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @package BP Nouveau
  */
@@ -10,14 +10,14 @@
 bp_nouveau_member_hook( 'before', 'settings_template' ); ?>
 
 <h2 class="screen-heading profile-settings-screen">
-	<?php _e('Profile Visibility Settings', 'bp-nouveau'); ?>
+	<?php _e( 'Profile Visibility Settings', 'bp-nouveau' ); ?>
 </h2>
 
 <p class="bp-help-text profile-visibility-info">
 	<?php _e( 'Select who may see your profile details.', 'bp-nouveau' ); ?>
 </p>
 
-<form action="<?php echo trailingslashit( bp_displayed_user_domain() . bp_get_settings_slug() . '/profile' ); ?>" method="post" class="standard-form" id="settings-form">
+<form action="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/profile/' ); ?>" method="post" class="standard-form" id="settings-form">
 
 	<?php if ( bp_xprofile_get_settings_fields() ) : ?>
 
@@ -25,7 +25,7 @@
 
 			<?php if ( bp_profile_fields() ) : ?>
 
-				<table class="profile-settings bp-tables-user" id="xprofile-settings-<?php bp_the_profile_group_slug(); ?>">
+				<table class="profile-settings bp-tables-user" id="<?php echo esc_attr( 'xprofile-settings-' . bp_get_the_profile_group_slug() ); ?>">
 					<thead>
 						<tr>
 							<th class="title field-group-name"><?php bp_the_profile_group_name(); ?></th>
diff --git a/bp-templates/bp-nouveau/includes/activity/ajax.php b/bp-templates/bp-nouveau/includes/activity/ajax.php
index cd39fde..d3fa49e 100644
--- a/bp-templates/bp-nouveau/includes/activity/ajax.php
+++ b/bp-templates/bp-nouveau/includes/activity/ajax.php
@@ -107,7 +107,7 @@ function bp_nouveau_ajax_unmark_activity_favorite() {
 /**
  * Clear mentions if the directory tab is clicked
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string JSON reply
  */
diff --git a/bp-templates/bp-nouveau/includes/activity/functions.php b/bp-templates/bp-nouveau/includes/activity/functions.php
index 36e92f5..106bfc0 100644
--- a/bp-templates/bp-nouveau/includes/activity/functions.php
+++ b/bp-templates/bp-nouveau/includes/activity/functions.php
@@ -13,7 +13,7 @@
 /**
  * Register Scripts for the Activity component
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $scripts  The array of scripts to register
  * @return array  The same array with the specific activity scripts.
@@ -55,7 +55,7 @@ function bp_nouveau_activity_enqueue_scripts() {
 /**
  * Localize the strings needed for the Activity Post form UI
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $params Associative array containing the JS Strings needed by scripts
  * @return array          The same array with specific strings for the Activity Post form UI if needed.
@@ -94,7 +94,7 @@ function bp_nouveau_activity_localize_scripts( $params = array() ) {
 	/**
 	 * Filter here to include specific Action buttons.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param array $value The array containing the button params. Must look like:
 	 * array( 'buttonid' => array(
@@ -278,7 +278,7 @@ function bp_nouveau_get_activity_directory_nav_items() {
 	/**
 	 * Use this filter to introduce your custom nav items for the activity directory.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  array $nav_items The list of the activity directory nav items.
 	 */
@@ -451,7 +451,7 @@ function bp_nouveau_activity_allowed_tags( $activity_allowedtags = array() ) {
 /**
  * Get the activity query args for the widget.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return array The activity arguments.
  */
@@ -466,7 +466,7 @@ function bp_nouveau_activity_widget_query() {
 	/**
 	 * Filter here to edit the activity widget arguments
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  array $args The activity arguments.
 	 */
diff --git a/bp-templates/bp-nouveau/includes/activity/template-tags.php b/bp-templates/bp-nouveau/includes/activity/template-tags.php
index 3862b9a..592c4ef 100644
--- a/bp-templates/bp-nouveau/includes/activity/template-tags.php
+++ b/bp-templates/bp-nouveau/includes/activity/template-tags.php
@@ -95,7 +95,7 @@ function bp_nouveau_after_activity_post_form() {
 /**
  * Display the displayed user activity post form if needed
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Outpur
  */
@@ -145,7 +145,7 @@ function bp_nouveau_activity_hook( $when = '', $suffix = '' ) {
 	/**
 	 * @since 1.2.0 (BuddyPress)
 	 */
-	return bp_nouveau_hook( $hook );
+	bp_nouveau_hook( $hook );
 }
 
 /**
@@ -237,9 +237,9 @@ function bp_nouveau_get_activity_entry_buttons( $args ) {
 		* parent_element args if set.
 		* Will render li elements around anchors/buttons.
 		*/
-		if( 'ul' == $args['container']  ) {
+		if ( 'ul' === $args['container']  ) {
 			$parent_element = 'li';
-		} elseif( ! empty( $args['parent_element'] ) ) {
+		} elseif ( ! empty( $args['parent_element'] ) ) {
 			$parent_element = esc_html( $args['parent_element'] );
 		} else {
 			$parent_element = false;
@@ -255,7 +255,7 @@ function bp_nouveau_get_activity_entry_buttons( $args ) {
 		 *
 		 */
 
-		if( ! empty( $args['button_element'] ) ) {
+		if ( ! empty( $args['button_element'] ) ) {
 			$button_element = $args['button_element'] ;
 		} else {
 			$button_element = 'a';
@@ -282,7 +282,7 @@ function bp_nouveau_get_activity_entry_buttons( $args ) {
 					'class'           => 'button view bp-secondary-action bp-tooltip',
 					'data-bp-tooltip' => __( 'View Conversation', 'bp-nouveau' ),
 					),
-				'link_text'  => sprintf('<span class="bp-screen-reader-text">%1$s</span>',esc_html__( 'View Conversation', 'bp-nouveau' ) ),
+				'link_text'  => sprintf( '<span class="bp-screen-reader-text">%1$s</span>',esc_html__( 'View Conversation', 'bp-nouveau' ) ),
 			);
 
 			// If button element set add url link to data-attr
@@ -628,7 +628,7 @@ function bp_nouveau_activity_recurse_comments( $comment ) {
 	/**
 	 * Filters the closing tag for the template that list activity comments.
 	 *
-	 * @since  1.6.0 (BuddyPress)
+	 * @since 1.6.0 (BuddyPress)
 	 *
 	 * @param string $value Closing tag for the HTML markup to use.
 	 */
@@ -744,22 +744,22 @@ function bp_nouveau_get_activity_comment_buttons($args) {
 		 * otherwise simply pass any value found in args
 		 * or set var false.
 		 */
-		if( 'ul' == $args['container']  ) {
+		if ( 'ul' === $args['container']  ) {
 			$parent_element = 'li';
-		} elseif( ! empty( $args['parent_element'] ) ) {
+		} elseif ( ! empty( $args['parent_element'] ) ) {
 			$parent_element = esc_html( $args['parent_element'] );
 		} else {
 			$parent_element = false;
 		}
 
-		$parent_attr = ( ! empty( $args['parent_attr'] ) )? $args['parent_attr']  : '';
+		$parent_attr = ( ! empty( $args['parent_attr'] ) ) ? $args['parent_attr']  : '';
 
 		/**
 		 * If we have a arg value for $button_element passed through
 		 * use it to default all the $buttons['button_element'] values
 		 * otherwise default to 'a' (anchor).
 		 */
-		if( !empty( $args['button_element'] ) ) {
+		if ( !empty( $args['button_element'] ) ) {
 			$button_element = $args['button_element'] ;
 		} else {
 			$button_element = 'a';
diff --git a/bp-templates/bp-nouveau/includes/activity/widgets.php b/bp-templates/bp-nouveau/includes/activity/widgets.php
index fc02bc3..ae4832c 100644
--- a/bp-templates/bp-nouveau/includes/activity/widgets.php
+++ b/bp-templates/bp-nouveau/includes/activity/widgets.php
@@ -14,7 +14,7 @@
 /**
  * A widget to display the latest activities of your community!
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 class BP_Latest_Activities extends WP_Widget {
 	/**
@@ -44,11 +44,10 @@ public static function register_widget() {
 	/**
 	 * Display the widget content.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  array $args     Widget arguments.
 	 * @param  array $instance Widget settings, as saved by the user.
-	 * @return string          HTML Output.
 	 */
 	public function widget( $args, $instance ) {
 		// Default values
@@ -116,7 +115,7 @@ public function widget( $args, $instance ) {
 	/**
 	 * Update the widget settings.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  array $new_instance The new instance settings.
 	 * @param  array $old_instance The old instance settings.
@@ -142,13 +141,12 @@ public function update( $new_instance, $old_instance ) {
 	/**
 	 * Display the form to set the widget settings.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  array  $instance Settings for this widget.
 	 * @return string           HTML output.
 	 */
 	public function form( $instance ) {
-		//Defaults
 		$instance = wp_parse_args( (array) $instance, array(
 			'title' => __( 'Latest updates', 'bp-nouveau' ),
 			'max'   => 5,
diff --git a/bp-templates/bp-nouveau/includes/blogs/functions.php b/bp-templates/bp-nouveau/includes/blogs/functions.php
index dfb0e9f..3aab3d1 100644
--- a/bp-templates/bp-nouveau/includes/blogs/functions.php
+++ b/bp-templates/bp-nouveau/includes/blogs/functions.php
@@ -64,7 +64,7 @@ function bp_nouveau_get_blogs_directory_nav_items() {
 	/**
 	 * Use this filter to introduce your custom nav items for the blogs directory.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  array $nav_items The list of the blogs directory nav items.
 	 */
@@ -175,7 +175,7 @@ function bp_nouveau_blogs_customizer_controls( $controls = array() ) {
 /**
  * Inline script to toggle the signup blog form
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string Javascript output
  */
@@ -212,10 +212,9 @@ function bp_nouveau_get_blog_signup_inline_script() {
 	 */
 function bp_nouveau_blog_loop_item_has_lastest_post( $classes) {
 	if ( bp_get_blog_latest_post_title() ) {
-	$classes[] = 'has-latest-post';
-	return $classes;
-	} else {
-		return $classes;
+		$classes[] = 'has-latest-post';
 	}
+
+	return $classes;
 }
 add_filter( 'bp_get_blog_class', 'bp_nouveau_blog_loop_item_has_lastest_post' );
diff --git a/bp-templates/bp-nouveau/includes/blogs/template-tags.php b/bp-templates/bp-nouveau/includes/blogs/template-tags.php
index ba80179..df0388e 100644
--- a/bp-templates/bp-nouveau/includes/blogs/template-tags.php
+++ b/bp-templates/bp-nouveau/includes/blogs/template-tags.php
@@ -108,7 +108,7 @@ function bp_nouveau_blogs_create_hook( $when = '', $suffix = '' ) {
 	 * @since 1.1.0 (BuddyPress) for the 'content' suffix
 	 * @since 1.6.0 (BuddyPress) for the 'content_template' suffix
 	 */
-	return bp_nouveau_hook( $hook );
+	bp_nouveau_hook( $hook );
 }
 
 /**
@@ -130,12 +130,12 @@ function bp_nouveau_blogs_loop_item() {
  *
  * @since 1.0.0
  *
- * @param  array $args @see bp_nouveau_wrapper() for the description of parameters.
+ * @param array $args @see bp_nouveau_wrapper() for the description of parameters.
  * @return string HTML Output
  */
 function bp_nouveau_blogs_loop_buttons( $args = array() ) {
 	if ( empty( $GLOBALS['blogs_template'] ) ) {
-		return;
+		return '';
 	}
 
 	$args['type'] = 'loop';
@@ -152,7 +152,7 @@ function bp_nouveau_blogs_loop_buttons( $args = array() ) {
 	$output .= ob_get_clean();
 
 	if ( empty( $output ) ) {
-		return;
+		return '';
 	}
 
 	return bp_nouveau_wrapper( array_merge( $args, array( 'output' => $output ) ) );
@@ -163,14 +163,15 @@ function bp_nouveau_blogs_loop_buttons( $args = array() ) {
 	 *
 	 * @since 1.0.0
 	 *
-	 * @param  string $type Type of Group of buttons to get.
+	 * @param string $type Type of Group of buttons to get.
+	 * @return array
 	 */
 	function bp_nouveau_get_blogs_buttons( $args ) {
-		$type = ( ! empty( $args['type'] ) ) ?  $args['type'] : 'loop';
+		$type = ( ! empty( $args['type'] ) ) ? $args['type'] : 'loop';
 
 		// Not really sure why BP Legacy needed to do this...
 		if ( 'loop' !== $type && is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			return;
+			return array();
 		}
 
 		$buttons = array();
@@ -183,22 +184,22 @@ function bp_nouveau_get_blogs_buttons( $args ) {
 			return $buttons;
 		}
 
-		/**
+		/*
 		 * If the 'container' is set to 'ul'
 		 * set a var $parent_element to li
 		 * otherwise simply pass any value found in args
 		 * or set var false.
 		 */
-		if( ! empty( $args['container'] ) && 'ul' == $args['container']  ) {
+		if ( ! empty( $args['container'] ) && 'ul' === $args['container']  ) {
 			$parent_element = 'li';
-		} elseif( ! empty( $args['parent_element'] ) ) {
+		} elseif ( ! empty( $args['parent_element'] ) ) {
 			$parent_element = esc_html( $args['parent_element'] );
 		} else {
 			$parent_element = false;
 		}
 
 
-		/**
+		/*
 		 * If we have a arg value for $button_element passed through
 		 * use it to default all the $buttons['button_element'] values
 		 * otherwise default to 'a' (anchor)
@@ -207,18 +208,19 @@ function bp_nouveau_get_blogs_buttons( $args ) {
 		 * Icons sets a class for icon display if not using the button element
 		 */
 		$icons = '';
-		if( ! empty( $args['button_element'] ) ) {
+		if ( ! empty( $args['button_element'] ) ) {
 			$button_element = $args['button_element'] ;
 		} else {
 			$button_element = 'a';
 			$icons = ' icons';
 		}
 
-		/**
+		/*
 		 * This filter workaround is waiting for a core adaptation
 		 * so that we can directly get the groups button arguments
 		 * instead of the button.
-		 * @see https://buddypress.trac.wordpress.org/ticket/7126
+		 *
+		 * See https://buddypress.trac.wordpress.org/ticket/7126
 		 */
 		add_filter( 'bp_get_blogs_visit_blog_button', 'bp_nouveau_blogs_catch_button_args', 100, 1 );
 
@@ -231,7 +233,7 @@ function bp_nouveau_get_blogs_buttons( $args ) {
 
 		// If we pass through parent classes add them to $button array
 		$parent_class = '';
-		if( ! empty( $args['parent_attr']['class'] ) ) {
+		if ( ! empty( $args['parent_attr']['class'] ) ) {
 			$parent_class = esc_html( $args['parent_attr']['class'] );
 		}
 
@@ -309,7 +311,7 @@ function bp_nouveau_get_blogs_buttons( $args ) {
 /**
  * Check if the Sites has a latest post
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True if the sites has a latest post. False otherwise.
  */
diff --git a/bp-templates/bp-nouveau/includes/classes.php b/bp-templates/bp-nouveau/includes/classes.php
index dedf289..97dc2fe 100644
--- a/bp-templates/bp-nouveau/includes/classes.php
+++ b/bp-templates/bp-nouveau/includes/classes.php
@@ -27,27 +27,27 @@ class BP_Buttons_Group {
 
 	/**
 	 * Constructor
-		*
+	 *
 	 * @since 1.0.0
 	 *
-		* @param array $args An array of array having the following parameters {
-		*     @type string $id                A string to use as the unique ID for the button. Required.
-		*     @type int    $position          Where to insert the Button. Defaults to 99.
-		*     @type string $component         The Component's the button is build for (eg: Activity, Groups..). Required.
-		*     @type bool   $must_be_logged_in Whether the button should only be displayed to logged in users. Defaults to True.
-		*     @type bool   $block_self        Optional. True if the button should be hidden when a user is viewing his own profile.
-		*                                     Defaults to False.
-		*     @type string $parent_element    Whether to use a wrapper. Defaults to false.
-		*     @type string $parent_attr       set an array of attributes for the parent element.
-		*     @type string $button_element    Set this to 'button', 'img', or 'a', defaults to anchor.
-		*     @type string $button_attr       Any attributes required for the button_element
-		*     @type string $link_text         The text of the link. Required.
-		* }
+	 * @param array $args Optional array having the following parameters {
+	 *     @type string $id                A string to use as the unique ID for the button. Required.
+	 *     @type int    $position          Where to insert the Button. Defaults to 99.
+	 *     @type string $component         The Component's the button is build for (eg: Activity, Groups..). Required.
+	 *     @type bool   $must_be_logged_in Whether the button should only be displayed to logged in users. Defaults to True.
+	 *     @type bool   $block_self        Optional. True if the button should be hidden when a user is viewing his own profile.
+	 *                                     Defaults to False.
+	 *     @type string $parent_element    Whether to use a wrapper. Defaults to false.
+	 *     @type string $parent_attr       set an array of attributes for the parent element.
+	 *     @type string $button_element    Set this to 'button', 'img', or 'a', defaults to anchor.
+	 *     @type string $button_attr       Any attributes required for the button_element
+	 *     @type string $link_text         The text of the link. Required.
+	 * }
 	 */
 	public function __construct( $args = array() ) {
 		if ( empty( $args ) || ! is_array( $args ) ) {
 			_doing_it_wrong( __( 'You need to use an array containing arrays of parameters.', 'bp-nouveau' ) );
-			return false;
+			return;
 		}
 
 		foreach ( $args as $arg ) {
@@ -136,16 +136,16 @@ public function sort( $buttons ) {
 	 * @return array An array of HTML links.
 	 */
 	public function get( $sort = true ) {
+		$buttons = array();
+
 		if ( empty( $this->group ) ) {
-			return;
+			return $buttons;
 		}
 
 		if ( true === $sort ) {
 			$this->group = $this->sort( $this->group );
 		}
 
-		$buttons = array();
-
 		foreach ( $this->group as $key_button => $button ) {
 			// Reindex with ids.
 			if ( true === $sort ) {
@@ -155,7 +155,8 @@ public function get( $sort = true ) {
 
 			$buttons[ $button['id'] ] = bp_get_button( $button);
 		}
-	return $buttons;
+
+		return $buttons;
 	}
 
 	/**
@@ -186,7 +187,7 @@ public function update( $args = array() ) {
  *
  * Adds a widget to move avatar/item nav into the sidebar
  *
- * @since  1.0
+ * @since 1.0
  *
  * @uses   WP_Widget
  */
@@ -195,9 +196,7 @@ class BP_Nouveau_Object_Nav_Widget extends WP_Widget {
 	/**
 	 * Constructor
 	 *
-	 * @since  1.0
-	 *
-	 * @uses   WP_Widget::__construct() to init the widget
+	 * @since 1.0
 	 */
 	public function __construct() {
 
@@ -216,7 +215,7 @@ public function __construct() {
 	/**
 	 * Register the widget
 	 *
-	 * @since  1.0
+	 * @since 1.0
 	 *
 	 * @uses   register_widget() to register the widget
 	 */
@@ -227,10 +226,9 @@ public static function register_widget() {
 	/**
 	 * Displays the output, the button to post new support topics
 	 *
-	 * @since  1.0
+	 * @since 1.0
 	 *
 	 * @param  mixed $args Arguments
-	 * @return string html output
 	 */
 	public function widget( $args, $instance ) {
 		if ( ! is_buddypress() || bp_is_group_create() ) {
@@ -277,7 +275,7 @@ public function widget( $args, $instance ) {
 	/**
 	 * Update the new support topic widget options (title)
 	 *
-	 * @since  1.0
+	 * @since 1.0
 	 *
 	 * @param  array $new_instance The new instance options
 	 * @param  array $old_instance The old instance options
@@ -294,7 +292,7 @@ public function update( $new_instance, $old_instance ) {
 	/**
 	 * Output the new support topic widget options form
 	 *
-	 * @since  1.0
+	 * @since 1.0
 	 *
 	 * @param  $instance Instance
 	 * @return string HTML Output
diff --git a/bp-templates/bp-nouveau/includes/customizer-controls.php b/bp-templates/bp-nouveau/includes/customizer-controls.php
index 62abbf5..0a6a2eb 100644
--- a/bp-templates/bp-nouveau/includes/customizer-controls.php
+++ b/bp-templates/bp-nouveau/includes/customizer-controls.php
@@ -18,7 +18,7 @@
  * https://developer.wordpress.org/themes/advanced-topics/customizer-api/#putting-the-pieces-together
  *
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 class BP_Nouveau_Nav_Customize_Control extends WP_Customize_Control {
 	public $type = '';
@@ -26,7 +26,7 @@ class BP_Nouveau_Nav_Customize_Control extends WP_Customize_Control {
 	/**
 	 * Render the control's content.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 */
 	public function render_content() {
 		$id       = 'customize-control-' . str_replace( '[', '-', str_replace( ']', '', $this->id ) );
@@ -87,7 +87,7 @@ public function render_content() {
 
 		<?php endif; ?>
 
-			<input id="bp_item_<?php echo esc_attr( $this->type ) ; ?>" type="hidden" value="" data-customize-setting-link="<?php echo esc_attr( $setting );?>" />
+			<input id="<?php echo esc_attr( 'bp_item_' . $this->type ) ; ?>" type="hidden" value="" data-customize-setting-link="<?php echo esc_attr( $setting );?>" />
 
 		<?php
 	}
diff --git a/bp-templates/bp-nouveau/includes/friends/ajax.php b/bp-templates/bp-nouveau/includes/friends/ajax.php
index 0ae7e2b..8702cd5 100644
--- a/bp-templates/bp-nouveau/includes/friends/ajax.php
+++ b/bp-templates/bp-nouveau/includes/friends/ajax.php
@@ -100,7 +100,7 @@ function bp_nouveau_ajax_addremove_friend() {
 		}
 
 	// Trying to cancel friendship.
-	} elseif ( 'is_friend' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
+	} elseif ( 'is_friend' === BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
 		if ( ! friends_remove_friend( bp_loggedin_user_id(), $friend_id ) ) {
 			$response['feedback'] = sprintf(
 				'<div class="bp-feedback error">%s</div>',
@@ -128,7 +128,7 @@ function bp_nouveau_ajax_addremove_friend() {
 		}
 
 	// Trying to request friendship.
-	} elseif ( 'not_friends' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
+	} elseif ( 'not_friends' === BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
 		if ( ! friends_add_friend( bp_loggedin_user_id(), $friend_id ) ) {
 			$response['feedback'] = sprintf(
 				'<div class="bp-feedback error">%s</div>',
@@ -141,7 +141,7 @@ function bp_nouveau_ajax_addremove_friend() {
 		}
 
 	// Trying to cancel pending request.
-	} elseif ( 'pending' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
+	} elseif ( 'pending' === BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
 		if ( friends_withdraw_friendship( bp_loggedin_user_id(), $friend_id ) ) {
 			wp_send_json_success( array( 'contents' => bp_get_add_friend_button( $friend_id ) ) );
 		} else {
diff --git a/bp-templates/bp-nouveau/includes/functions.php b/bp-templates/bp-nouveau/includes/functions.php
index bb7b8ed..d078f9f 100644
--- a/bp-templates/bp-nouveau/includes/functions.php
+++ b/bp-templates/bp-nouveau/includes/functions.php
@@ -210,7 +210,7 @@ function bp_nouveau_ajax_button( $output ='', $button = null, $before ='', $afte
 /**
  * Output HTML content into a wrapper.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $args {
  *     Array of arguments.
@@ -235,7 +235,7 @@ function bp_nouveau_wrapper( $args = array() ) {
 // 'activity-meta'
 	$current_component_class = bp_current_component() . '-meta';
 
-	if ( 'groups' == bp_current_component() && 'activity' == bp_current_action() ) :
+	if ( 'groups' === bp_current_component() && 'activity' === bp_current_action() ) :
 		$generic_class = ' activity-meta ';
 	else:
 		$generic_class = '';
@@ -258,7 +258,7 @@ function bp_nouveau_wrapper( $args = array() ) {
 
 	// Actually merge some classes defaults and $args
 	// @todo This is temp, we need certain classes but maybe improve this approach.
-	$default_classes = array('action');
+	$default_classes = array( 'action' );
 	$r['container_classes'] = array_merge( $r['container_classes'], $default_classes );
 
 	if ( empty( $r['container'] ) || ! isset( $valid_containers[ $r['container'] ] ) || empty( $r['output'] ) ) {
@@ -285,7 +285,7 @@ function bp_nouveau_wrapper( $args = array() ) {
 /**
  * Register the 2 sidebars for the Group & User default front page
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_register_sidebars() {
 	$default_fronts      = bp_nouveau_get_appearance_settings();
@@ -358,7 +358,7 @@ function bp_nouveau_current_user_can( $capability = '' ) {
 /**
  * BP Nouveau will not use this hooks anymore
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return array the list of disused legacy hooks
  */
@@ -591,7 +591,7 @@ function bp_nouveau_get_forsaken_hooks() {
 /**
  * Parse an html output to a list of component's directory nav item.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string  $hook      The hook to fire.
  * @param  string  $component The component nav belongs to.
@@ -771,7 +771,7 @@ function bp_nouveau_get_temporary_setting( $option = '', $retval = false ) {
 			if ( 0 !== strpos( $key, 'bp_nouveau_appearance' ) ) {
 				continue;
 			}
-			$k = str_replace( array( '[', ']'), array( '_', '' ), $key );
+			$k = str_replace( array( '[', ']' ), array( '_', '' ), $key );
 			$retval[ $k ] = $setting;
 		}
 
@@ -860,7 +860,7 @@ function bp_nouveau_get_appearance_settings( $option = '' ) {
  * Returns the choices for the Layout option of the customizer
  * or the list of corresponding css classes.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $type 'option' to get the labels, 'classes' to get the classes
  * @return array  the list of labels or classes preserving keys.
@@ -883,7 +883,7 @@ function bp_nouveau_customizer_grid_choices( $type = 'option' ) {
 /**
  * Sanitize a list of slugs to save it as an array
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $option A comma separated list of nav items slugs.
  * @return array          An array of nav items slugs.
@@ -896,7 +896,7 @@ function bp_nouveau_sanitize_nav_order( $option = '' ) {
 /**
  * BP Nouveau's callback for the cover image feature.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array $params the current component's feature parameters.
  * @return array          an array to inform about the css handle to attach the css rules to
@@ -913,7 +913,7 @@ function bp_nouveau_theme_cover_image( $params = array() ) {
 	$top_offset  = bp_core_avatar_full_height() - 10;
 	$left_offset = bp_core_avatar_full_width() + 20;
 
-	$cover_image = isset( $params['cover_image'] ) ? 'background-image: url(' . $params['cover_image'] . ');' : '';
+	$cover_image = isset( $params['cover_image'] ) ? 'background-image: url( ' . $params['cover_image'] . ' );' : '';
 
 	$hide_avatar_style = '';
 
@@ -1558,7 +1558,7 @@ function bp_nouveau_get_submit_button( $action = '' ) {
 /**
  * Reorder a BuddyPress item nav according to a given list of nav item slugs
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  object $nav         The BuddyPress Item Nav object to reorder
  * @param  array  $order       A list of slugs ordered (eg: array( 'profile', 'activity', etc..) )
diff --git a/bp-templates/bp-nouveau/includes/groups/classes.php b/bp-templates/bp-nouveau/includes/groups/classes.php
index 06c3118..6fd3bca 100644
--- a/bp-templates/bp-nouveau/includes/groups/classes.php
+++ b/bp-templates/bp-nouveau/includes/groups/classes.php
@@ -146,7 +146,7 @@ public static function get_inviter_ids( $user_id = 0, $group_id = 0 ) {
  * A specific Group Nav class to make it possible to
  * set new positions for the buddypress()->groups->nav.
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 class BP_Nouveau_Customizer_Group_Nav extends BP_Core_Nav {
 
@@ -227,7 +227,7 @@ public function __set( $key, $value ) {
 	/**
 	 * Setup a temporary nav with only the needed parameters.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 */
 	private function setup_nav() {
 		$nav_items = array(
@@ -317,7 +317,7 @@ private function setup_nav() {
 	/**
 	 * Front template: do not look into group's template hierarchy.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  array  $templates The list of possible group front templates.
 	 * @return array             The list of "global" group front templates.
@@ -332,7 +332,7 @@ public function all_groups_fronts( $templates = array() ) {
 	/**
 	 * Get the original order for the group navigation.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return array a list of nav items slugs ordered.
 	 */
@@ -344,7 +344,7 @@ public function get_default_value() {
 	/**
 	 * Get the list of nav items ordered according to the Site owner preferences.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return array the nav items ordered.
 	 */
diff --git a/bp-templates/bp-nouveau/includes/groups/functions.php b/bp-templates/bp-nouveau/includes/groups/functions.php
index 8f318a6..f675a7b 100644
--- a/bp-templates/bp-nouveau/includes/groups/functions.php
+++ b/bp-templates/bp-nouveau/includes/groups/functions.php
@@ -13,7 +13,7 @@
 /**
  * Register Scripts for the Groups component
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $scripts  The array of scripts to register
  * @return array  The same array with the specific groups scripts.
@@ -59,7 +59,7 @@ function bp_nouveau_groups_enqueue_scripts() {
 /**
  * Can all members be invited to join any group?
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  bool $default False to allow. True to disallow.
  * @return bool
@@ -68,7 +68,7 @@ function bp_nouveau_groups_disallow_all_members_invites( $default = false ) {
 	/**
 	 * Filter here to remove the All members nav, returning true
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  bool $default True to disable the nav. False otherwise.
 	 */
@@ -78,7 +78,7 @@ function bp_nouveau_groups_disallow_all_members_invites( $default = false ) {
 /**
  * Localize the strings needed for the Group's Invite UI
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $params Associative array containing the JS Strings needed by scripts
  * @return array          The same array with specific strings for the Group's Invite UI if needed.
@@ -332,7 +332,7 @@ function bp_nouveau_prepare_group_for_js( $item ) {
 /**
  * Group invites restriction settings navigation.
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_groups_invites_restriction_nav() {
 	$slug        = bp_get_settings_slug();
@@ -357,7 +357,7 @@ function bp_nouveau_groups_invites_restriction_nav() {
 /**
  * Group invites restriction settings Admin Bar navigation.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param   array $wp_admin_nav The list of settings admin subnav items.
  * @return  array The list of settings admin subnav items.
@@ -381,7 +381,7 @@ function bp_nouveau_groups_invites_restriction_admin_nav( $wp_admin_nav ) {
 /**
  * Group invites restriction screen.
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_groups_screen_invites_restriction() {
 
@@ -477,7 +477,7 @@ function bp_nouveau_get_groups_directory_nav_items() {
 	/**
 	 * Use this filter to introduce your custom nav items for the groups directory.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  array $nav_items The list of the groups directory nav items.
 	 */
@@ -550,7 +550,7 @@ function bp_nouveau_groups_catch_button_args( $button = array() ) {
 /**
  * Catch the content hooked to the 'bp_group_header_meta' action
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string|bool HTML Output if hooked. False otherwise.
  */
@@ -576,7 +576,7 @@ function bp_nouveau_get_hooked_group_meta() {
 /**
  * Display the Widgets of Group extensions into the default front page?
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True to display. False otherwise.
  */
@@ -589,7 +589,7 @@ function bp_nouveau_groups_do_group_boxes() {
 /**
  * Display description of the Group into the default front page?
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True to display. False otherwise.
  */
@@ -746,7 +746,7 @@ function bp_nouveau_groups_customizer_controls( $controls = array() ) {
 /**
  * Add the default group front template to the front template hierarchy.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array           $templates The list of templates for the front.php template part.
  * @param  BP_Groups_Group The group object.
@@ -774,7 +774,7 @@ function bp_nouveau_group_reset_front_template( $templates = array(), $group = n
 /**
  * Locate a single group template into a specific hierarchy.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $template The template part to get (eg: activity, members...).
  * @return string The located template.
@@ -826,7 +826,7 @@ function bp_nouveau_group_locate_template_part( $template = '' ) {
 /**
  * Load a single group template part
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $template The template part to get (eg: activity, members...).
  * @return string HTML output.
@@ -855,7 +855,7 @@ function bp_nouveau_group_get_template_part( $template = '' ) {
 /**
  * Are we inside the Current group's default front page sidebar?
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True if in the group's home sidebar. False otherwise.
  */
@@ -866,7 +866,7 @@ function bp_nouveau_group_is_home_widgets() {
 /**
  * Filter the Latest activities Widget to only keep the one of the group displayed
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $args The Activities Template arguments.
  * @return array        The Activities Template arguments.
@@ -881,7 +881,7 @@ function bp_nouveau_group_activity_widget_overrides( $args = array() ) {
 /**
  * Filter the Groups widget to only keep the displayed group.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $args The Groups Template arguments.
  * @return array        The Groups Template arguments.
@@ -895,7 +895,7 @@ function bp_nouveau_group_groups_widget_overrides( $args = array() ) {
 /**
  * Filter the Members widgets to only keep members of the displayed group.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $args The Members Template arguments.
  * @return array        The Members Template arguments.
@@ -915,7 +915,7 @@ function bp_nouveau_group_members_widget_overrides( $args = array() ) {
 /**
  * Init the Group's default front page filters as we're in the sidebar
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_groups_add_home_widget_filters() {
 	add_filter( 'bp_nouveau_activity_widget_query', 'bp_nouveau_group_activity_widget_overrides', 10, 1 );
@@ -928,7 +928,7 @@ function bp_nouveau_groups_add_home_widget_filters() {
 /**
  * Remove the Group's default front page filters as we're no more in the sidebar
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_groups_remove_home_widget_filters() {
 	remove_filter( 'bp_nouveau_activity_widget_query', 'bp_nouveau_group_activity_widget_overrides', 10, 1 );
@@ -941,7 +941,7 @@ function bp_nouveau_groups_remove_home_widget_filters() {
 /**
  * Get the hook, nonce, and eventually a specific template for Core Group's create screens.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $id  The screen id
  * @return mixed       An array containing the hook dynamic part, the nonce, and eventually a specific template.
@@ -969,7 +969,7 @@ function bp_nouveau_group_get_core_create_screens( $id = '' ) {
 /**
  * Get the hook and nonce for Core Group's manage screens.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $id  The screen id
  * @return mixed       An array containing the hook dynamic part and the nonce. False if it's not a core manage screen.
@@ -981,7 +981,7 @@ function bp_nouveau_group_get_core_manage_screens( $id = '' ) {
 	$screens = array(
 		'edit-details'        => array( 'hook' => 'group_details_admin',             'nonce' => 'groups_edit_group_details'  ),
 		'group-settings'      => array( 'hook' => 'group_settings_admin',            'nonce' => 'groups_edit_group_settings' ),
-		'group-avatar'        => array(                                                                                      ),
+		'group-avatar'        => array(),
 		'group-cover-image'   => array( 'hook' => 'group_settings_cover_image',      'nonce' => ''                           ),
 		'manage-members'      => array( 'hook' => 'group_manage_members_admin',      'nonce' => ''                           ),
 		'membership-requests' => array( 'hook' => 'group_membership_requests_admin', 'nonce' => ''                           ),
diff --git a/bp-templates/bp-nouveau/includes/groups/loader.php b/bp-templates/bp-nouveau/includes/groups/loader.php
index 5813b4b..8f28526 100644
--- a/bp-templates/bp-nouveau/includes/groups/loader.php
+++ b/bp-templates/bp-nouveau/includes/groups/loader.php
@@ -25,11 +25,7 @@ class BP_Nouveau_Groups {
 	public function __construct() {
 		$this->setup_globals();
 		$this->includes();
-
-		// Setup list of add_action() hooks
 		$this->setup_actions();
-
-		// Setup list of add_filter() hooks
 		$this->setup_filters();
 	}
 
@@ -77,7 +73,6 @@ private function setup_actions() {
 			add_action( 'groups_setup_nav', 'bp_nouveau_group_setup_nav' );
 		}
 
-		// Enqueue the scripts
 		add_action( 'bp_nouveau_enqueue_scripts', 'bp_nouveau_groups_enqueue_scripts' );
 
 		// Avoid Notices for BuddyPress Legacy Backcompat
@@ -86,7 +81,7 @@ private function setup_actions() {
 		// Register the Groups Notifications filters
 		add_action( 'bp_nouveau_notifications_init_filters', 'bp_nouveau_groups_notification_filters' );
 
-		// Actions to check wether we are in the Group's default front page sidebar
+		// Actions to check whether we are in the Group's default front page sidebar
 		add_action( 'dynamic_sidebar_before', array( $this, 'group_home_sidebar_set'   ), 10, 1 );
 		add_action( 'dynamic_sidebar_after',  array( $this, 'group_home_sidebar_unset' ), 10, 1 );
 
@@ -102,12 +97,8 @@ private function setup_actions() {
 	 * @since 1.0.0
 	 */
 	private function setup_filters() {
-		// Register groups scripts
 		add_filter( 'bp_nouveau_register_scripts', 'bp_nouveau_groups_register_scripts', 10, 1 );
-
-		// Localize Scripts
 		add_filter( 'bp_core_get_js_strings', 'bp_nouveau_groups_localize_scripts', 10, 1 );
-
 		add_filter( 'groups_create_group_steps', 'bp_nouveau_group_invites_create_steps', 10, 1 );
 
 		$buttons = array(
@@ -146,9 +137,9 @@ private function setup_filters() {
 	 * Add filters to be sure the (BuddyPress) widgets display will be consistent
 	 * with the current group's default front page.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
-	 * @param  string $sidebar_index The Sidebar identifier.
+	 * @param string $sidebar_index The Sidebar identifier.
 	 */
 	public function group_home_sidebar_set( $sidebar_index = '' ) {
 		if ( 'sidebar-buddypress-groups' !== $sidebar_index ) {
@@ -165,7 +156,7 @@ public function group_home_sidebar_set( $sidebar_index = '' ) {
 	 * Remove filters to be sure the (BuddyPress) widgets display will no more take
 	 * the current group displayed in account.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  string $sidebar_index The Sidebar identifier.
 	 */
diff --git a/bp-templates/bp-nouveau/includes/groups/template-tags.php b/bp-templates/bp-nouveau/includes/groups/template-tags.php
index 2479cdb..7bc3976 100644
--- a/bp-templates/bp-nouveau/includes/groups/template-tags.php
+++ b/bp-templates/bp-nouveau/includes/groups/template-tags.php
@@ -102,7 +102,7 @@ function bp_nouveau_groups_create_hook( $when = '', $suffix = '' ) {
 	 * @since 1.6.0 (BuddyPress) for the 'content_template' suffix
 	 * @since 1.7.0 (BuddyPress) for the 'page' suffix
 	 */
-	return bp_nouveau_hook( $hook );
+	bp_nouveau_hook( $hook );
 }
 
 /**
@@ -134,7 +134,7 @@ function bp_nouveau_group_hook( $when = '', $suffix = '' ) {
 	 * @since 1.2.0 (BuddyPress) for the 'activity_content', 'header_meta', 'home_content',
 	 *                           'plugin_template', 'friend_requests_content' suffixes.
 	 */
-	return bp_nouveau_hook( $hook );
+	bp_nouveau_hook( $hook );
 }
 
 /**
@@ -154,7 +154,7 @@ function bp_nouveau_groups_loop_item() {
 /**
  * Display the current group activity post form if needed
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Outpur
  */
@@ -181,7 +181,7 @@ function bp_nouveau_groups_activity_post_form() {
 /**
  * Load the Group Invites UI.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output.
  */
@@ -206,7 +206,7 @@ function bp_nouveau_group_invites_interface() {
 /**
  * Gets the displayed user group invites preferences
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return int 1 if user chose to restrict to friends. O otherwise.
  */
@@ -238,7 +238,7 @@ function bp_nouveau_group_creation_tabs() {
 	foreach ( (array) $bp->groups->group_creation_steps as $slug => $step ) {
 		$is_enabled = bp_are_previous_group_creation_steps_complete( $slug ); ?>
 
-		<li<?php if ( bp_get_groups_current_create_step() == $slug ) : ?> class="current"<?php endif; ?>>
+		<li<?php if ( bp_get_groups_current_create_step() === $slug ) : ?> class="current"<?php endif; ?>>
 			<?php if ( $is_enabled ) : ?>
 				<a href="<?php bp_groups_directory_permalink(); ?>create/step/<?php echo $slug ?>/">
 					<?php echo $counter ?> <?php echo $step['name'] ?>
@@ -265,7 +265,7 @@ function bp_nouveau_group_creation_tabs() {
 /**
  * Load the requested Create Screen for the new group.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output.
  */
@@ -276,7 +276,7 @@ function bp_nouveau_group_creation_screen() {
 /**
  * Load the requested Manage Screen for the current group.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output.
  */
@@ -391,7 +391,7 @@ function bp_nouveau_group_manage_screen() {
 		 */
 		do_action( 'bp_before_group_creation_step_buttons' );
 
-		if ( 'crop-image' != bp_get_avatar_admin_step() ) {
+		if ( 'crop-image' !== bp_get_avatar_admin_step() ) {
 			$creation_step_buttons = '';
 
 			if ( ! bp_is_first_group_creation_step() ) {
@@ -640,7 +640,7 @@ function bp_nouveau_groups_manage_members_buttons( $args = array() ) {
 	 */
 	function bp_nouveau_get_groups_buttons( $args ) {
 
-		$type = ( ! empty( $args['type'] ) ) ?  $args['type'] : 'group';
+		$type = ( ! empty( $args['type'] ) ) ? $args['type'] : 'group';
 
 		// Not really sure why BP Legacy needed to do this...
 		if ( 'group' === $type && is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
@@ -649,7 +649,7 @@ function bp_nouveau_get_groups_buttons( $args ) {
 
 		$buttons = array();
 
-		if ( ( 'loop' === $type || 'invite' ===  $type ) && isset( $GLOBALS['groups_template']->group ) ) {
+		if ( ( 'loop' === $type || 'invite' === $type ) && isset( $GLOBALS['groups_template']->group ) ) {
 			$group = $GLOBALS['groups_template']->group;
 		} else {
 			$group = groups_get_current_group();
@@ -665,9 +665,9 @@ function bp_nouveau_get_groups_buttons( $args ) {
 		 * simply pass any value found in $args
 		 * or set var false.
 		 */
-		if( ! empty( $args['container'] ) && 'ul' == $args['container']  ) {
+		if ( ! empty( $args['container'] ) && 'ul' === $args['container']  ) {
 			$parent_element = 'li';
-		} elseif( ! empty( $args['parent_element'] ) ) {
+		} elseif ( ! empty( $args['parent_element'] ) ) {
 			$parent_element = esc_html( $args['parent_element'] );
 		} else {
 			$parent_element = false;
@@ -682,7 +682,7 @@ function bp_nouveau_get_groups_buttons( $args ) {
 		 * Icons sets a class for icon display if not using the button element
 		 */
 		$icons = '';
-		if( ! empty( $args['button_element'] ) ) {
+		if ( ! empty( $args['button_element'] ) ) {
 			$button_element = $args['button_element'] ;
 		} else {
 			$button_element = 'a';
@@ -691,7 +691,7 @@ function bp_nouveau_get_groups_buttons( $args ) {
 
 		// If we pass through parent classes add them to $button array
 		$parent_class = '';
-		if( ! empty( $args['parent_attr']['class'] ) ) {
+		if ( ! empty( $args['parent_attr']['class'] ) ) {
 			$parent_class = esc_html( $args['parent_attr']['class'] );
 		}
 
@@ -951,7 +951,7 @@ function bp_nouveau_get_groups_buttons( $args ) {
 				$button_args = bp_nouveau()->groups->button_args;
 
 				// If we pass through parent classes merge those into the existing ones
-				if( ! empty( $parent_class ) ) {
+				if ( ! empty( $parent_class ) ) {
 					$parent_class .= ' ' . $button_args['wrapper_class'];
 				}
 
@@ -1047,7 +1047,7 @@ function bp_nouveau_get_groups_buttons( $args ) {
 /**
  * Does the group has meta.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True if the group has meta. False otherwise.
  */
@@ -1058,7 +1058,7 @@ function bp_nouveau_group_has_meta() {
 /**
  * Does the group have extra meta?
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True if the group has meta. False otherwise.
  */
@@ -1069,7 +1069,7 @@ function bp_nouveau_group_has_meta_extra() {
 /**
  * Display the group meta.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output.
  */
@@ -1092,7 +1092,7 @@ function bp_nouveau_group_meta() {
 	/**
 	 * Get the group meta.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return array The group meta.
 	 */
@@ -1148,7 +1148,7 @@ function bp_nouveau_get_group_meta() {
 			/**
 			 * Filter here to add/remove Group meta.
 			 *
-			 * @since  1.0.0
+			 * @since 1.0.0
 			 *
 			 * @param array  $meta     The list of meta to output.
 			 * @param object $group    The current Group of the loop object.
@@ -1163,7 +1163,7 @@ function bp_nouveau_get_group_meta() {
 /**
  * Load the appropriate content for the single group pages
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output.
  */
@@ -1241,7 +1241,7 @@ function bp_nouveau_group_template_part() {
 /**
  * Use the appropriate Group header and enjoy a template hierarchy
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output
  */
@@ -1276,7 +1276,7 @@ function bp_nouveau_group_header_template_part() {
  * Get a link to set the Group's default front page and directly
  * reach the Customizer section where it's possible to do it.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output
  */
@@ -1292,7 +1292,7 @@ function bp_nouveau_groups_get_customizer_option_link() {
  * Get a link to set the Group's front page widgets and directly
  * reach the Customizer section where it's possible to do it.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output
  */
@@ -1345,8 +1345,8 @@ function bp_nouveau_get_group_description_excerpt( $group =false, $length = fals
 	// If this is a grid layout but no length is passed in set shorter
 	// default value otherwise use the passed in value.
 	// If not a grid then the BP core default is used or passed in value.
-	if( bp_nouveau_loop_is_grid() && 'groups' == bp_current_component() ) {
-		if ( false == $length ) {
+	if ( bp_nouveau_loop_is_grid() && 'groups' === bp_current_component() ) {
+		if ( false === $length ) {
 			$length = 100;
 		} elseif ( $length ) {
 			$length = $length;
diff --git a/bp-templates/bp-nouveau/includes/members/functions.php b/bp-templates/bp-nouveau/includes/members/functions.php
index 7ac22a0..11759bd 100644
--- a/bp-templates/bp-nouveau/includes/members/functions.php
+++ b/bp-templates/bp-nouveau/includes/members/functions.php
@@ -76,7 +76,7 @@ function bp_nouveau_get_members_directory_nav_items() {
 	/**
 	 * Use this filter to introduce your custom nav items for the members directory.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  array $nav_items The list of the members directory nav items.
 	 */
@@ -158,7 +158,7 @@ function bp_nouveau_members_catch_button_args( $button = array() ) {
  * Catch the content hooked to the do_action hooks in single member header
  * and in the members loop
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string|bool HTML Output if hooked. False otherwise.
  */
@@ -198,7 +198,7 @@ function bp_nouveau_get_hooked_member_meta() {
 /**
  * Add the default user front template to the front template hierarchy
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $templates The list of templates for the front.php template part.
  * @return array  The same list with the default front template if needed.
@@ -221,7 +221,7 @@ function bp_nouveau_member_reset_front_template( $templates = array() ) {
 /**
  * Only locate global user's front templates
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $templates The User's front template hierarchy.
  * @return array             Only the global front templates.
@@ -236,7 +236,7 @@ function bp_nouveau_member_restrict_user_front_templates( $templates = array() )
 /**
  * Locate a single member template into a specific hierarchy.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $template The template part to get (eg: activity, groups...).
  * @return string The located template.
@@ -256,7 +256,7 @@ function bp_nouveau_member_locate_template_part( $template = '' ) {
 			'members/single/%s-nicename-' . sanitize_file_name( $displayed_user->userdata->user_nicename ) . '.php',
 		);
 
-		/**
+		/*
 		 * Check for member types and add it to the hierarchy
 		 *
 		 * Make sure to register your member
@@ -275,7 +275,6 @@ function bp_nouveau_member_locate_template_part( $template = '' ) {
 		$bp_nouveau->members->displayed_user_hierarchy[] = 'members/single/%s.php';
 	}
 
-	// Init the templates
 	$templates = array();
 
 	// Loop in the hierarchy to fill it for the requested template part
@@ -289,7 +288,7 @@ function bp_nouveau_member_locate_template_part( $template = '' ) {
 /**
  * Load a single member template part
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $template The template part to get (eg: activity, groups...).
  * @return string HTML output.
@@ -318,7 +317,7 @@ function bp_nouveau_member_get_template_part( $template = '' ) {
 /**
  * Display the User's WordPress bio info into the default front page?
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True to display. False otherwise.
  */
@@ -331,7 +330,7 @@ function bp_nouveau_members_wp_bio_info() {
 /**
  * Are we inside the Current user's default front page sidebar?
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True if in the group's home sidebar. False otherwise.
  */
@@ -342,7 +341,7 @@ function bp_nouveau_member_is_home_widgets() {
 /**
  * Filter the Latest activities Widget to only keep the one of displayed user
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $args The Activities Template arguments.
  * @return array        The Activities Template arguments.
@@ -356,7 +355,7 @@ function bp_nouveau_member_activity_widget_overrides( $args = array() ) {
 /**
  * Filter the Groups widget to only keep the groups the displayed user is a member of.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $args The Groups Template arguments.
  * @return array        The Groups Template arguments.
@@ -370,7 +369,7 @@ function bp_nouveau_member_groups_widget_overrides( $args = array() ) {
 /**
  * Filter the Members widgets to only keep members of the displayed group.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $args The Members Template arguments.
  * @return array        The Members Template arguments.
@@ -389,7 +388,7 @@ function bp_nouveau_member_members_widget_overrides( $args = array() ) {
 /**
  * Init the Member's default front page filters as we're in the sidebar
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_members_add_home_widget_filters() {
 	add_filter( 'bp_nouveau_activity_widget_query', 'bp_nouveau_member_activity_widget_overrides', 10, 1 );
@@ -402,7 +401,7 @@ function bp_nouveau_members_add_home_widget_filters() {
 /**
  * Remove the Member's default front page filters as we're no more in the sidebar
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_members_remove_home_widget_filters() {
 	remove_filter( 'bp_nouveau_activity_widget_query', 'bp_nouveau_member_activity_widget_overrides', 10, 1 );
@@ -415,7 +414,7 @@ function bp_nouveau_members_remove_home_widget_filters() {
 /**
  * Get the WP Profile fields for all or a specific user
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  WP_User $user The user object. Optional.
  * @return array         The list of WP Profile fields
@@ -436,7 +435,7 @@ function bp_nouveau_get_wp_profile_fields( $user = null ) {
 /**
  * Build the Member's nav for the our customizer control.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return array The Members single item primary nav ordered.
  */
diff --git a/bp-templates/bp-nouveau/includes/members/loader.php b/bp-templates/bp-nouveau/includes/members/loader.php
index f8ec27c..5ee8552 100644
--- a/bp-templates/bp-nouveau/includes/members/loader.php
+++ b/bp-templates/bp-nouveau/includes/members/loader.php
@@ -25,11 +25,7 @@ class BP_Nouveau_Members {
 	public function __construct() {
 		$this->setup_globals();
 		$this->includes();
-
-		// Setup list of add_action() hooks
 		$this->setup_actions();
-
-		// Setup list of add_filter() hooks
 		$this->setup_filters();
 	}
 
@@ -73,10 +69,9 @@ private function setup_actions() {
 			}
 		}
 
-		// Maybe enqueue some additional styles or scripts
 		add_action( 'bp_nouveau_enqueue_scripts', 'bp_nouveau_members_enqueue_scripts' );
 
-		// Actions to check wether we are in the member's default front page sidebar
+		// Actions to check whether we are in the member's default front page sidebar
 		add_action( 'dynamic_sidebar_before', array( $this, 'user_home_sidebar_set'   ), 10, 1 );
 		add_action( 'dynamic_sidebar_after',  array( $this, 'user_home_sidebar_unset' ), 10, 1 );
 	}
@@ -95,9 +90,9 @@ private function setup_filters() {
 	 * Add filters to be sure the (BuddyPress) widgets display will be consistent
 	 * with the displayed user's default front page.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
-	 * @param  string $sidebar_index The Sidebar identifier.
+	 * @param string $sidebar_index The Sidebar identifier.
 	 */
 	public function user_home_sidebar_set( $sidebar_index = '' ) {
 		if ( 'sidebar-buddypress-members' !== $sidebar_index ) {
@@ -114,7 +109,7 @@ public function user_home_sidebar_set( $sidebar_index = '' ) {
 	 * Remove filters to be sure the (BuddyPress) widgets display will no more take
 	 * the displayed user in account.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @param  string $sidebar_index The Sidebar identifier.
 	 */
diff --git a/bp-templates/bp-nouveau/includes/members/template-tags.php b/bp-templates/bp-nouveau/includes/members/template-tags.php
index 95fab93..d02379d 100644
--- a/bp-templates/bp-nouveau/includes/members/template-tags.php
+++ b/bp-templates/bp-nouveau/includes/members/template-tags.php
@@ -110,7 +110,7 @@ function bp_nouveau_member_hook( $when = '', $suffix = '' ) {
 	 *                           'friend_requests_content' suffixes.
 	 * @since 1.5.0 (BuddyPress) for the 'settings_template' suffix.
 	 */
-	return bp_nouveau_hook( $hook );
+	bp_nouveau_hook( $hook );
 }
 
 /**
@@ -138,7 +138,7 @@ function bp_nouveau_member_email_notice_settings() {
 function bp_nouveau_member_header_buttons( $args = array() ) {
 	$bp_nouveau = bp_nouveau();
 
-	if( bp_is_user() ) {
+	if ( bp_is_user() ) {
 		$args['type'] = 'profile';
 	} else {
 		$args['type'] = 'header';// we have no real need for this 'type' on header actions
@@ -164,7 +164,7 @@ function bp_nouveau_member_header_buttons( $args = array() ) {
 	$output .= ob_get_clean();
 
 	if ( empty( $output ) ) {
-		return;
+		return '';
 	}
 
 	if ( empty( $args ) ) {
@@ -184,13 +184,13 @@ function bp_nouveau_member_header_buttons( $args = array() ) {
  */
 function bp_nouveau_members_loop_buttons( $args = array() ) {
 	if ( empty( $GLOBALS['members_template'] ) ) {
-		return;
+		return '';
 	}
 
 	$args['type'] = 'loop';
 	$action = 'bp_directory_members_actions';
 
-	// specific case for group members
+	// Specific case for group members.
 	if ( bp_is_active( 'groups' ) && bp_is_group_members() ) {
 		$args['type']   = 'group_member';
 		$action = 'bp_group_members_list_item_action';
@@ -211,7 +211,7 @@ function bp_nouveau_members_loop_buttons( $args = array() ) {
 	$output .= ob_get_clean();
 
 	if ( empty( $output ) ) {
-		return;
+		return '';
 	}
 
 	return bp_nouveau_wrapper( array_merge( $args, array( 'output' => $output ) ) );
@@ -221,18 +221,18 @@ function bp_nouveau_members_loop_buttons( $args = array() ) {
 	 * Get the action buttons for the displayed user profile
 	 *
 	 * @since 1.0.0
+	 *
+	 * @return array
 	 */
 	function bp_nouveau_get_members_buttons( $args ) {
-
-		$type = ( ! empty( $args['type'] ) ) ?  $args['type'] : '';
+		$buttons = array();
+		$type = ( ! empty( $args['type'] ) ) ? $args['type'] : '';
 
 		// Not really sure why BP Legacy needed to do this...
 		if ( 'profile' === $type && is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			return;
+			return $buttons;
 		}
 
-		$buttons = array();
-
 		if ( 'loop' === $type || 'friendship_request' === $type ) {
 			$user_id = bp_get_member_user_id();
 		} elseif ( 'group_member' === $type ) {
@@ -245,21 +245,21 @@ function bp_nouveau_get_members_buttons( $args ) {
 			return $buttons;
 		}
 
-		/**
+		/*
 		 * If the 'container' is set to 'ul'
 		 * set a var $parent_element to li
 		 * otherwise simply pass any value found in args
 		 * or set var false.
 		 */
-		if( ! empty( $args['container'] ) && 'ul' == $args['container']  ) {
+		if ( ! empty( $args['container'] ) && 'ul' === $args['container']  ) {
 			$parent_element = 'li';
-		} elseif( ! empty( $args['parent_element'] ) ) {
+		} elseif ( ! empty( $args['parent_element'] ) ) {
 			$parent_element = esc_html( $args['parent_element'] );
 		} else {
 			$parent_element = false;
 		}
 
-		/**
+		/*
 		 * If we have a arg value for $button_element passed through
 		 * use it to default all the $buttons['button_element'] values
 		 * otherwise default to 'a' (anchor)
@@ -268,7 +268,7 @@ function bp_nouveau_get_members_buttons( $args ) {
 		 * Icons sets a class for icon display if not using the button element
 		 */
 		$icons = '';
-		if( ! empty( $args['button_element'] ) ) {
+		if ( ! empty( $args['button_element'] ) ) {
 			$button_element = $args['button_element'] ;
 		} else {
 			$button_element = 'button';
@@ -277,13 +277,13 @@ function bp_nouveau_get_members_buttons( $args ) {
 
 		// If we pass through parent classes add them to $button array
 		$parent_class = '';
-		if( ! empty( $args['parent_attr']['class'] ) ) {
+		if ( ! empty( $args['parent_attr']['class'] ) ) {
 			$parent_class = esc_html( $args['parent_attr']['class'] );
 		}
 
 		if ( bp_is_active( 'friends' ) ) {
 			// It's the member's friendship requests screen
-			if (  'friendship_request' === $type ) {
+			if ( 'friendship_request' === $type ) {
 				$buttons = array( 'accept_friendship' => array(
 						'id'                => 'accept_friendship',
 						'position'          => 5,
@@ -323,20 +323,21 @@ function bp_nouveau_get_members_buttons( $args ) {
 
 				// If button element set add nonce link to data attr
 				if ( 'button' === $button_element ) {
-					$buttons['accept_friendship']['button_attr']['data-bp-nonce']  = esc_url( bp_get_friend_accept_request_link() );
-					$buttons['reject_friendship']['button_attr']['data-bp-nonce']  = esc_url( bp_get_friend_reject_request_link() );
+					$buttons['accept_friendship']['button_attr']['data-bp-nonce'] = esc_url( bp_get_friend_accept_request_link() );
+					$buttons['reject_friendship']['button_attr']['data-bp-nonce'] = esc_url( bp_get_friend_reject_request_link() );
 				} else {
-					$buttons['accept_friendship']['button_attr']['href']     = esc_url( bp_get_friend_accept_request_link() );
-					$buttons['reject_friendship']['button_attr']['href']  = esc_url( bp_get_friend_reject_request_link() );
+					$buttons['accept_friendship']['button_attr']['href'] = esc_url( bp_get_friend_accept_request_link() );
+					$buttons['reject_friendship']['button_attr']['href'] = esc_url( bp_get_friend_reject_request_link() );
 				}
 
 			// It's any other members screen
 			} else {
-				/**
+				/*
 				 * This filter workaround is waiting for a core adaptation
 				 * so that we can directly get the friends button arguments
 				 * instead of the button.
-				 * @see https://buddypress.trac.wordpress.org/ticket/7126
+				 *
+				 * See https://buddypress.trac.wordpress.org/ticket/7126
 				 */
 				add_filter( 'bp_get_add_friend_button', 'bp_nouveau_members_catch_button_args', 100, 1 );
 
@@ -378,17 +379,17 @@ function bp_nouveau_get_members_buttons( $args ) {
 					unset( bp_nouveau()->members->button_args );
 				}
 			}
-
 		}
 
 		// Only add The public and private messages when not in a loop
 		if ( 'profile' === $type ) {
 			if ( bp_is_active( 'activity' ) && bp_activity_do_mentions() ) {
-				/**
+				/*
 				 * This filter workaround is waiting for a core adaptation
 				 * so that we can directly get the public message button arguments
 				 * instead of the button.
-				 * @see https://buddypress.trac.wordpress.org/ticket/7126
+				 *
+				 * See https://buddypress.trac.wordpress.org/ticket/7126
 				 */
 				add_filter( 'bp_get_send_public_message_button', 'bp_nouveau_members_catch_button_args', 100, 1 );
 
@@ -399,8 +400,10 @@ function bp_nouveau_get_members_buttons( $args ) {
 				if ( ! empty( bp_nouveau()->members->button_args ) ) {
 					$button_args = bp_nouveau()->members->button_args;
 
-					// This button should remain as an anchor link
-					// Hardcode the use of anchor elements if button arg passed in for other elements
+					/*
+					 * This button should remain as an anchor link.
+					 * Hardcode the use of anchor elements if button arg passed in for other elements.
+					 */
 					$buttons['public_message'] = array(
 						'id'                => $button_args['id'],
 						'position'          => 15,
@@ -442,8 +445,10 @@ function bp_nouveau_get_members_buttons( $args ) {
 				if ( ! empty( bp_nouveau()->members->button_args ) ) {
 					$button_args = bp_nouveau()->members->button_args;
 
-					// This button should remain as an anchor link
-					// Hardcode the use of anchor elements if button arg passed in for other elements
+					/*
+					 * This button should remain as an anchor link.
+					 * Hardcode the use of anchor elements if button arg passed in for other elements.
+					 */
 					$buttons['private_message'] = array(
 						'id'                => $button_args['id'],
 						'position'          => 25,
@@ -461,7 +466,7 @@ function bp_nouveau_get_members_buttons( $args ) {
 							'id'               => false,
 							'class'            => $button_args['link_class'],
 							'rel'              => '',
-							'title'            => __('', 'buddypress'),
+							'title'            => __( '', 'buddypress' ),
 							),
 						'link_text'         => $button_args['link_text'],
 					);
@@ -520,7 +525,7 @@ function bp_nouveau_get_members_buttons( $args ) {
 /**
  * Does the member has meta.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True if the member has meta. False otherwise.
  */
@@ -531,20 +536,18 @@ function bp_nouveau_member_has_meta() {
 /**
  * Display the member meta.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output.
  */
 function bp_nouveau_member_meta() {
-	$meta = bp_nouveau_get_member_meta();
-
-	echo join( "\n", $meta );
+	echo join( "\n", bp_nouveau_get_member_meta() );
 }
 
 	/**
 	 * Get the member meta.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return array The member meta.
 	 */
@@ -585,7 +588,7 @@ function bp_nouveau_get_member_meta() {
 			/**
 			 * Filter here to add/remove Member meta.
 			 *
-			 * @since  1.0.0
+			 * @since 1.0.0
 			 *
 			 * @param array  $meta     The list of meta to output.
 			 * @param object $member   The member object
@@ -600,9 +603,7 @@ function bp_nouveau_get_member_meta() {
 /**
  * Load the appropriate content for the single member pages
  *
- * @since  1.0.0
- *
- * @return string HTML Output.
+ * @since 1.0.0
  */
 function bp_nouveau_member_template_part() {
 	/**
@@ -649,7 +650,7 @@ function bp_nouveau_member_template_part() {
 /**
  * Use the appropriate Member header and enjoy a template hierarchy
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output
  */
@@ -677,7 +678,6 @@ function bp_nouveau_member_header_template_part() {
 	 */
 	do_action( 'bp_after_member_header' );
 
-	// Display template notices if any
 	bp_nouveau_template_notices();
 }
 
@@ -685,7 +685,7 @@ function bp_nouveau_member_header_template_part() {
  * Get a link to set the Member's default front page and directly
  * reach the Customizer section where it's possible to do it.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output
  */
@@ -701,7 +701,7 @@ function bp_nouveau_members_get_customizer_option_link() {
  * Get a link to set the Member's front page widgets and directly
  * reach the Customizer section where it's possible to do it.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output
  */
@@ -716,7 +716,7 @@ function bp_nouveau_members_get_customizer_widgets_link() {
 /**
  * Display the Member description making sure linefeeds are taking in account
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output
  */
@@ -750,7 +750,7 @@ function bp_nouveau_member_description( $user_id = 0 ) {
  * Display the Edit profile link (temporary)
  * @todo  replace with Ajax feature
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output
  */
@@ -762,12 +762,11 @@ function bp_nouveau_member_description_edit_link() {
 	 * Get the Edit profile link (temporary)
 	 * @todo  replace with Ajax featur
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string HTML Output
 	 */
 	function bp_nouveau_member_get_description_edit_link() {
-		// Disable the filter
 		remove_filter( 'edit_profile_url', 'bp_members_edit_profile_url', 10, 3 );
 
 		if ( is_multisite() && ! current_user_can( 'read' ) ) {
@@ -776,9 +775,7 @@ function bp_nouveau_member_get_description_edit_link() {
 			$link = get_edit_profile_url( bp_displayed_user_id() );
 		}
 
-		// Restore the filter
 		add_filter( 'edit_profile_url', 'bp_members_edit_profile_url', 10, 3 );
-
 		$link .= '#description';
 
 		return sprintf( '<a href="%1$s">%2$s</a>', esc_url( $link ), esc_html__( 'Edit your bio', 'bp-nouveau' ) );
@@ -834,7 +831,7 @@ function bp_nouveau_wp_profile_hooks( $type = 'before' ) {
 /**
  * Does the displayed user has WP profile fields?
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True if user has profile fields. False otherwise.
  */
@@ -877,7 +874,7 @@ function bp_nouveau_has_wp_profile_fields() {
 /**
  * Check if there are still profile fields to output.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True if the profile field exists. False otherwise.
  */
@@ -897,7 +894,7 @@ function bp_nouveau_wp_profile_fields() {
 /**
  * Set the current profile field and iterate into the loop.
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_wp_profile_field() {
 	$bp_nouveau = bp_nouveau();
@@ -909,7 +906,7 @@ function bp_nouveau_wp_profile_field() {
 /**
  * Output the WP profile field ID.
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_wp_profile_field_id() {
 	echo bp_nouveau_get_wp_profile_field_id();
@@ -917,9 +914,9 @@ function bp_nouveau_wp_profile_field_id() {
 	/**
 	 * Get the WP profile field ID.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
-	 * @return string the profile field ID.
+	 * @return int the profile field ID.
 	 */
 	function bp_nouveau_get_wp_profile_field_id() {
 		$field = bp_nouveau()->members->wp_profile_current;
@@ -930,7 +927,7 @@ function bp_nouveau_get_wp_profile_field_id() {
 /**
  * Output the WP profile field label.
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_wp_profile_field_label() {
 	echo bp_nouveau_get_wp_profile_field_label();
@@ -939,7 +936,7 @@ function bp_nouveau_wp_profile_field_label() {
 	/**
 	 * Get the WP profile label.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string the profile field label.
 	 */
@@ -952,7 +949,7 @@ function bp_nouveau_get_wp_profile_field_label() {
 /**
  * Output the WP profile field data.
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_wp_profile_field_data() {
 	echo bp_nouveau_get_wp_profile_field_data();
@@ -961,7 +958,7 @@ function bp_nouveau_wp_profile_field_data() {
 	/**
 	 * Get the WP profile field data.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string the profile field data.
 	 */
diff --git a/bp-templates/bp-nouveau/includes/messages/functions.php b/bp-templates/bp-nouveau/includes/messages/functions.php
index e181f20..57f50b4 100644
--- a/bp-templates/bp-nouveau/includes/messages/functions.php
+++ b/bp-templates/bp-nouveau/includes/messages/functions.php
@@ -13,7 +13,7 @@
 /**
  * Enqueue Styles for the Messages UI (mentions)
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $styles  The array of styles to enqueue
  * @return array  The same array with the specific messages styles.
@@ -36,7 +36,7 @@ function bp_nouveau_messages_enqueue_styles( $styles = array() ) {
 /**
  * Register Scripts for the Messages component
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $scripts  The array of scripts to register
  * @return array  The same array with the specific messages scripts.
@@ -82,7 +82,7 @@ function bp_nouveau_messages_enqueue_scripts() {
 /**
  * Localize the strings needed for the messages UI
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $params Associative array containing the JS Strings needed by scripts
  * @return array          The same array with specific strings for the messages UI if needed.
@@ -134,7 +134,7 @@ function bp_nouveau_message_search_form() {
 
 	$search_form_html = '<form action="" method="get" id="search-messages-form">
 		<label for="messages_search"><input type="text" name="' . esc_attr( $query_arg ) . '" id="messages_search" placeholder="'. esc_attr( $placeholder ) .'" /></label>
-		<input type="submit" id="messages_search_submit" name="messages_search_submit" value="' . __( 'Search', 'bp-nouveau' ) . '" />
+		<input type="submit" id="messages_search_submit" name="messages_search_submit" value="' . esc_attr_e( 'Search', 'bp-nouveau' ) . '" />
 	</form>';
 
 	/**
@@ -254,7 +254,7 @@ function bp_nouveau_unregister_notices_widget() {
 /**
  * Add active sitewide notices to the BP template_message global.
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_push_sitewide_notices() {
 	// Do not show notices if user is not logged in.
diff --git a/bp-templates/bp-nouveau/includes/messages/template-tags.php b/bp-templates/bp-nouveau/includes/messages/template-tags.php
index c7e0545..111a91b 100644
--- a/bp-templates/bp-nouveau/includes/messages/template-tags.php
+++ b/bp-templates/bp-nouveau/includes/messages/template-tags.php
@@ -41,13 +41,13 @@ function bp_nouveau_messages_hook( $when = '', $suffix = '' ) {
 	 *                           'content', 'thread_content', 'thread_list', 'reply_box' suffixes
 	 * @since 1.1.0 (BuddyPress) for the 'compose_content' (before), 'thread_reply' suffixes
 	 */
-	return bp_nouveau_hook( $hook );
+	bp_nouveau_hook( $hook );
 }
 
 /**
  * Load the new Messages User Interface
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output
  */
diff --git a/bp-templates/bp-nouveau/includes/notifications/functions.php b/bp-templates/bp-nouveau/includes/notifications/functions.php
index 4d1ee15..e9159e3 100644
--- a/bp-templates/bp-nouveau/includes/notifications/functions.php
+++ b/bp-templates/bp-nouveau/includes/notifications/functions.php
@@ -13,7 +13,7 @@
 /**
  * Register Scripts for the Notifications component
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $scripts  The array of scripts to register
  * @return array  The same array with the specific notifications scripts.
@@ -51,7 +51,7 @@ function bp_nouveau_notifications_enqueue_scripts() {
  * Init Notifications filters and fire a hook to let
  * plugins/components register their filters.
  *
- * @since  1.0.O
+ * @since 1.0.O
  */
 function bp_nouveau_notifications_init_filters() {
 	if ( ! bp_is_user_notifications() ) {
@@ -63,7 +63,7 @@ function bp_nouveau_notifications_init_filters() {
 	/**
 	 * Hook here to register your custom notification filters
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 */
 	do_action( 'bp_nouveau_notifications_init_filters' );
 }
@@ -71,7 +71,7 @@ function bp_nouveau_notifications_init_filters() {
 /**
  * Register new filters for the notifications screens.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $args {
  *     Array of arguments.
@@ -106,7 +106,7 @@ function bp_nouveau_notifications_register_filter( $args = array() ) {
 /**
  * Get one or all notifications filters.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $id  The notificication component action to get the filter of.
  *                     Leave empty to get all notifications filters.
@@ -132,7 +132,7 @@ function bp_nouveau_notifications_get_filters( $id = '' ) {
 /**
  * Sort Notifications according to their position arguments.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $filters The notifications filters to order.
  * @return array  The sorted filters.
@@ -171,7 +171,7 @@ function bp_nouveau_notifications_sort( $filters = array() ) {
 /**
  * Add a dashicon to Notifications action links
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $link        The action link.
  * @param  string $bp_tooltip  The data-bp-attribute of the link.
@@ -201,7 +201,7 @@ function bp_nouveau_notifications_dashiconified_link( $link = '', $bp_tooltip =
 /**
  * Edit the Mark Unread action link to include a dashicon
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $link The Mark Unread action link.
  * @return string       Link Output.
@@ -213,7 +213,7 @@ function bp_nouveau_notifications_mark_unread_link( $link = '' ) {
 /**
  * Edit the Mark Read action link to include a dashicon
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $link The Mark Read action link.
  * @return string       Link Output.
@@ -225,7 +225,7 @@ function bp_nouveau_notifications_mark_read_link( $link = '' ) {
 /**
  * Edit the Delete action link to include a dashicon
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  string $link The Delete action link.
  * @return string       Link Output.
diff --git a/bp-templates/bp-nouveau/includes/notifications/template-tags.php b/bp-templates/bp-nouveau/includes/notifications/template-tags.php
index 04a2b50..eae6c48 100644
--- a/bp-templates/bp-nouveau/includes/notifications/template-tags.php
+++ b/bp-templates/bp-nouveau/includes/notifications/template-tags.php
@@ -13,7 +13,7 @@
 /**
  * Display the notifications filter options.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML output.
  */
@@ -24,7 +24,7 @@ function bp_nouveau_notifications_filters() {
 	/**
 	 * Get the notifications filter options.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string HTML output.
 	 */
@@ -60,7 +60,7 @@ function bp_nouveau_get_notifications_filters() {
 		/**
 		 * Filter here to edit the options output.
 		 *
-		 * @since  1.0.0
+		 * @since 1.0.0
 		 *
 		 * @param  string $output  The options output.
 		 * @param  array  $filters The sorted notifications filters.
@@ -71,7 +71,7 @@ function bp_nouveau_get_notifications_filters() {
 /**
  * Outputs the order action links.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML output.
  */
@@ -87,8 +87,8 @@ function bp_nouveau_notifications_sort_order_links() {
 	?>
 
 	<span class="notifications-order-actions">
-		<a href="<?php echo esc_url( $desc ); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Newest First', 'bp-nouveau'); ?>" aria-label="<?php esc_attr_e( 'Newest First', 'bp-nouveau'); ?>" data-bp-notifications-order="DESC"><span class="dashicons dashicons-arrow-down"></span></a>
-		<a href="<?php echo esc_url( $asc ); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Older First', 'bp-nouveau'); ?>" aria-label="<?php esc_attr_e( 'Older First', 'bp-nouveau'); ?>" data-bp-notifications-order="ASC"><span class="dashicons dashicons-arrow-up" aria-hidden="true"></span></a>
+		<a href="<?php echo esc_url( $desc ); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Newest First', 'bp-nouveau' ); ?>" aria-label="<?php esc_attr_e( 'Newest First', 'bp-nouveau' ); ?>" data-bp-notifications-order="DESC"><span class="dashicons dashicons-arrow-down"></span></a>
+		<a href="<?php echo esc_url( $asc ); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Older First', 'bp-nouveau' ); ?>" aria-label="<?php esc_attr_e( 'Older First', 'bp-nouveau' ); ?>" data-bp-notifications-order="ASC"><span class="dashicons dashicons-arrow-up" aria-hidden="true"></span></a>
 	</span>
 
 	<?php
@@ -102,7 +102,7 @@ function bp_nouveau_notifications_sort_order_links() {
  * @return string HTML output.
  */
 function bp_nouveau_notifications_bulk_management_dropdown() {
-	?>
+?>
 
 	<div class="select-wrap">
 
@@ -124,7 +124,7 @@ function bp_nouveau_notifications_bulk_management_dropdown() {
 
 		<span class="select-arrow"></span>
 
-</div><!-- // .select-wrap -->
+	</div><!-- // .select-wrap -->
 
 	<input type="submit" id="notification-bulk-manage" class="button action" value="<?php esc_attr_e( 'Apply', 'buddypress' ); ?>">
 	<?php
diff --git a/bp-templates/bp-nouveau/includes/template-tags.php b/bp-templates/bp-nouveau/includes/template-tags.php
index a97b9bc..eefa2dc 100644
--- a/bp-templates/bp-nouveau/includes/template-tags.php
+++ b/bp-templates/bp-nouveau/includes/template-tags.php
@@ -49,7 +49,7 @@ function bp_nouveau_plugin_hook( $suffix = '' ) {
 	 *
 	 * @since 1.0.0 (BuddyPress)
 	 */
-	return bp_nouveau_hook( array(
+	bp_nouveau_hook( array(
 		'bp',
 		'template',
 		$suffix,
@@ -74,7 +74,7 @@ function bp_nouveau_friend_hook( $suffix = '' ) {
 	/**
 	 * @since 1.1.0 (BuddyPress)
 	 */
-	return bp_nouveau_hook( array(
+	bp_nouveau_hook( array(
 		'bp',
 		'friend',
 		$suffix,
@@ -84,7 +84,7 @@ function bp_nouveau_friend_hook( $suffix = '' ) {
 /**
  * Add classes to style the template notice/feedback message
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string Css class Output
  */
@@ -174,7 +174,7 @@ function bp_nouveau_dismiss_button_type() {
 /**
  * Displays a template notice/feedback message.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output.
  */
@@ -185,7 +185,7 @@ function bp_nouveau_template_message() {
 	/**
 	 * Get the template notice/feedback message and make sure core filter is applied.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string HTML Output.
 	 */
@@ -302,7 +302,7 @@ function bp_nouveau_user_feedback( $feedback_id = '' ) {
 /**
  * Template tag to wrap the before component loop
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_before_loop() {
 	$component = bp_current_component();
@@ -322,7 +322,7 @@ function bp_nouveau_before_loop() {
 /**
  * Template tag to wrap the after component loop
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_after_loop() {
 	$component = bp_current_component();
@@ -478,7 +478,7 @@ function bp_nouveau_pagination( $position = null ) {
 /**
  * Display the component's loop classes
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string CSS classes
  */
@@ -489,7 +489,7 @@ function bp_nouveau_loop_classes() {
 	/**
 	 * Get the component's loop classes
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string space separated value of classes.
 	 */
@@ -501,9 +501,9 @@ function bp_nouveau_get_loop_classes() {
 		*/
 
 		// The $component is faked if it's the single group member loop
-		if( !bp_is_directory() && ( bp_is_group() && 'members' === bp_current_action() ) ) :
+		if ( !bp_is_directory() && ( bp_is_group() && 'members' === bp_current_action() ) ) :
 			$component  = 'members_group';
-		elseif( ! bp_is_directory() && ( bp_is_user() && 'my-friends' === bp_current_action() ) ):
+		elseif ( ! bp_is_directory() && ( bp_is_user() && 'my-friends' === bp_current_action() ) ):
 			$component  = 'members_friends';
 		else :
 			$component  = sanitize_key( bp_current_component() );
@@ -511,11 +511,11 @@ function bp_nouveau_get_loop_classes() {
 
 		$classes = array(
 			'item-list',
-			sprintf( '%s-list', str_replace('_', '-', $component ) ),
+			sprintf( '%s-list', str_replace( '_', '-', $component ) ),
 			'bp-list',
 		);
 
-		if( bp_is_user() && 'my-friends' === bp_current_action() ) {
+		if ( bp_is_user() && 'my-friends' === bp_current_action() ) {
 			$classes[] = 'members-list';
 		}
 
@@ -568,7 +568,7 @@ function bp_nouveau_get_loop_classes() {
 /**
  * Checks if the layout preferences is set to grid (2 or more columns).
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True if loop is displayed in grid mod. False otherwise.
  */
@@ -618,7 +618,7 @@ function bp_dir_is_vert_layout() {
 /**
  * Get the full size avatar args.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return array The avatar arguments.
  */
@@ -642,7 +642,7 @@ function bp_nouveau_avatar_args() {
 /**
  * Init the Navigation Loop and checks it has items.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $args {
  *     Array of arguments.
@@ -754,7 +754,7 @@ function bp_nouveau_has_nav( $args = array() ) {
 /**
  * Checks there are still nav items to display.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return bool True if there are still items to display.
  *              False otherwise.
@@ -776,7 +776,7 @@ function bp_nouveau_nav_items() {
  * Sets the current nav item and prepare the navigation loop
  * to iterate to next one.
  *
- * @since  1.0.0
+ * @since 1.0.0
  */
 function bp_nouveau_nav_item() {
 	$bp_nouveau = bp_nouveau();
@@ -797,7 +797,7 @@ function bp_nouveau_nav_id() {
 	/**
 	 * Retrieve the ID attribute of the current nav item.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string the ID attribute.
 	 */
@@ -837,7 +837,7 @@ function bp_nouveau_nav_classes() {
 	/**
 	 * Retrieve a space separated list of classes for the current nav item.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string the list of classes.
 	 */
@@ -908,7 +908,7 @@ function bp_nouveau_nav_scope() {
 	/**
 	 * Retrieve the specific scope for the current nav item.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string the specific scope of the nav.
 	 */
@@ -953,7 +953,7 @@ function bp_nouveau_nav_link() {
 	/**
 	 * Retrieve the link for the current nav item.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string The link for the nav item.
 	 */
@@ -998,7 +998,7 @@ function bp_nouveau_nav_link_id() {
 	/**
 	 * Retrieve the id attribute of the link for the current nav item.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string The link id for the nav item.
 	 */
@@ -1041,7 +1041,7 @@ function bp_nouveau_nav_link_title() {
 	/**
 	 * Retrieve the title attribute of the link for the current nav item.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string The link title for the nav item.
 	 */
@@ -1080,7 +1080,7 @@ function bp_nouveau_nav_link_text() {
 	/**
 	 * Retrieve the html text of the link for the current nav item.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string The html text for the nav item.
 	 */
@@ -1149,7 +1149,7 @@ function bp_nouveau_nav_count() {
 	/**
 	 * Retrieve the count attribute for the current nav item.
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string The count attribute for the nav item.
 	 */
@@ -1215,7 +1215,7 @@ function bp_nouveau_get_directory_type_navs_class() {
 			$nav_style  = bp_nouveau_get_temporary_setting( $customizer_option, bp_nouveau_get_appearance_settings( $customizer_option ) );
 			$tab_style = '';
 
-			if( 1 === $nav_style ) {
+			if ( 1 === $nav_style ) {
 				$tab_style = bp_current_component() . '-nav-tabs';
 			}
 
@@ -1290,7 +1290,7 @@ function bp_nouveau_get_directory_nav_object() {
 /**
  * Output main BuddyPress container classes
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string CSS classes
  */
@@ -1301,7 +1301,7 @@ function bp_nouveau_buddypress_classes() {
 	/**
 	 * Returns the main BuddyPress container classes
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string CSS classes
 	 */
@@ -1346,12 +1346,12 @@ function bp_nouveau_get_buddypress_classes() {
 			$customizer_option = apply_filters( 'bp_nouveau_single_item_display_settings_id', '' );
 		}
 
-		if( $member_type_class ) {
+		if ( $member_type_class ) {
 			$classes[] = $member_type_class;
 		}
 
 		// Provide a class token to acknowledge additional extended profile fields added to default account reg screen
-		if( 'register' === bp_current_component() && bp_is_active( 'xprofile' ) && bp_nouveau_base_account_has_xprofile() ){
+		if ( 'register' === bp_current_component() && bp_is_active( 'xprofile' ) && bp_nouveau_base_account_has_xprofile() ){
 			$classes[] = 'extended-default-reg';
 		}
 
@@ -1386,7 +1386,7 @@ function bp_nouveau_get_buddypress_classes() {
 /**
  * Output single item nav container classes
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string CSS classes
  */
@@ -1397,7 +1397,7 @@ function bp_nouveau_single_item_nav_classes() {
 	/**
 	 * Returns the single item nav container classes
 	 *
-	 * @since  1.0.0
+	 * @since 1.0.0
 	 *
 	 * @return string CSS classes
 	 */
@@ -1410,13 +1410,13 @@ function bp_nouveau_get_single_item_nav_classes() {
 		// this is a temp workaround but differs from earlier dir approach- bad!
 		if ( bp_is_group() ) {
 			$nav_tabs = bp_nouveau_get_temporary_setting( 'group_nav_tabs', bp_nouveau_get_appearance_settings( 'group_nav_tabs' ) );
-		} elseif( bp_is_user() ) {
+		} elseif ( bp_is_user() ) {
 			$nav_tabs = bp_nouveau_get_temporary_setting( 'user_nav_tabs', bp_nouveau_get_appearance_settings( 'user_nav_tabs' ) );
 		}
 
-		if(  bp_is_group() && 1 === $nav_tabs) {
+		if ( bp_is_group() && 1 === $nav_tabs) {
 			$classes[] = 'group-nav-tabs';
-		} elseif( bp_is_user() && 1 === $nav_tabs ) {
+		} elseif ( bp_is_user() && 1 === $nav_tabs ) {
 			$classes[] = 'user-nav-tabs';
 		}
 
@@ -1766,7 +1766,7 @@ function bp_nouveau_filter_options() {
 
 	function bp_nouveau_get_filter_options() {
 
-	if('notifications' === bp_current_component() ) :
+	if ( 'notifications' === bp_current_component() ) :
 			bp_nouveau_notifications_filters();
 		return;
 
@@ -1794,7 +1794,7 @@ function bp_nouveau_get_filter_options() {
 /**
  * Get a link to reach a specific section into the customizer
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $args The argument to customize the Customizer link
  * @return string HTML Output
@@ -1880,7 +1880,7 @@ function bp_nouveau_signup_hook( $when = '', $prefix = '' ) {
 	 * @since 1.2.4 (BuddyPress) Adds the 'bp_before_signup_profile_fields' action hook
 	 * @since 1.9.0 (BuddyPress) Adds the 'bp_signup_profile_fields' action hook
 	 */
-	return bp_nouveau_hook( $hook );
+	bp_nouveau_hook( $hook );
 }
 
 /**
@@ -1911,7 +1911,7 @@ function bp_nouveau_activation_hook( $when = '', $suffix = '' ) {
 	/**
 	 * @since 1.1.0 (BuddyPress)
 	 */
-	return bp_nouveau_hook( $hook );
+	bp_nouveau_hook( $hook );
 }
 
 /**
diff --git a/bp-templates/bp-nouveau/includes/xprofile/functions.php b/bp-templates/bp-nouveau/includes/xprofile/functions.php
index c19d89f..c9aac4d 100644
--- a/bp-templates/bp-nouveau/includes/xprofile/functions.php
+++ b/bp-templates/bp-nouveau/includes/xprofile/functions.php
@@ -13,7 +13,7 @@
 /**
  * Register Scripts for the xProfile component
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @param  array  $scripts  The array of scripts to register
  * @return array  The same array with the specific groups scripts.
diff --git a/bp-templates/bp-nouveau/includes/xprofile/template-tags.php b/bp-templates/bp-nouveau/includes/xprofile/template-tags.php
index ac5e2bc..7e97216 100644
--- a/bp-templates/bp-nouveau/includes/xprofile/template-tags.php
+++ b/bp-templates/bp-nouveau/includes/xprofile/template-tags.php
@@ -38,7 +38,7 @@ function bp_nouveau_xprofile_hook( $when = '', $suffix = '' ) {
 	 * @since 1.2.0 (BuddyPress) for the 'loop_content' suffix.
 	 * @since 2.4.0 (BuddyPress) for the 'edit_cover_image' suffix.
 	 */
-	return bp_nouveau_hook( $hook );
+	bp_nouveau_hook( $hook );
 }
 
 
@@ -46,7 +46,7 @@ function bp_nouveau_xprofile_hook( $when = '', $suffix = '' ) {
  * Template tag to output the field visibility markup in
  * edit and signup screens.
  *
- * @since  1.0.0
+ * @since 1.0.0
  *
  * @return string HTML Output
  */
@@ -90,16 +90,16 @@ function nouveau_the_profile_group_name( $base_name = null ) {
 function nouveau_get_the_profile_group_name( $base_name ) {
 	global $group;
 
-	if( empty( $base_name ) )
+	if ( empty( $base_name ) )
 		$base_name = 'Primary Account';
 
-	if('Base' == $group->name ) {
+	if ( 'Base' === $group->name ) {
 		$group->name = $base_name;
 	}
 
-	$base_name = apply_filters('nouveau_get_the_profile_group_name', $group->name );
+	$base_name = apply_filters( 'nouveau_get_the_profile_group_name', $group->name );
 
 	return $base_name;
 }
-add_filter('bp_get_the_profile_group_name', 'nouveau_get_the_profile_group_name');
+add_filter( 'bp_get_the_profile_group_name', 'nouveau_get_the_profile_group_name' );
 */