diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
index f0e8953271..1928f0a5bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
@@ -106,6 +106,7 @@ public interface BootstrapContext {
 	 * we migrate away from Hibernate Commons Annotations to Jandex for annotation handling
 	 * and XMl->annotation merging.
 	 */
+	@Deprecated
 	ReflectionManager getReflectionManager();
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpdateEventListenerStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpdateEventListenerStandardImpl.java
index 5f4fe5590b..4e68dd10d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpdateEventListenerStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/PostUpdateEventListenerStandardImpl.java
@@ -46,4 +46,4 @@ public class PostUpdateEventListenerStandardImpl implements PostUpdateEventListe
 	public boolean requiresPostCommitHanding(EntityPersister persister) {
 		return callbackRegistry.hasRegisteredCallbacks( persister.getMappedClass(), CallbackType.POST_UPDATE );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java
index 0e226d9670..ad75cca445 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java
@@ -102,9 +102,10 @@ public class EventListenerRegistryImpl implements EventListenerRegistry, Stoppab
 	 * @deprecated Use {@link EventListenerRegistryImpl#EventListenerRegistryImpl(BootstrapContext, SessionFactoryImplementor)} instead
 	 */
 	@Deprecated
-	EventListenerRegistryImpl(SessionFactoryImplementor sessionFactory,
-							  SessionFactoryOptions sessionFactoryOptions,
-							  ServiceRegistryImplementor registry) {
+	EventListenerRegistryImpl(
+			SessionFactoryImplementor sessionFactory,
+			SessionFactoryOptions sessionFactoryOptions,
+			ServiceRegistryImplementor registry) {
 		this.sessionFactory = sessionFactory;
 
 		this.callbackRegistry = new CallbackRegistryImpl();
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
index 91a27a48a5..c03c6736ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -404,8 +404,9 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 			if ( !propertyName.startsWith( org.hibernate.jpa.AvailableSettings.EVENT_LISTENER_PREFIX ) ) {
 				continue;
 			}
-			final String eventTypeName = propertyName.substring( org.hibernate.jpa.AvailableSettings.EVENT_LISTENER_PREFIX
-																		 .length() + 1 );
+			final String eventTypeName = propertyName.substring(
+					org.hibernate.jpa.AvailableSettings.EVENT_LISTENER_PREFIX.length() + 1
+			);
 			final EventType eventType = EventType.resolveEventTypeByName( eventTypeName );
 			final EventListenerGroup eventListenerGroup = eventListenerRegistry.getEventListenerGroup( eventType );
 			for ( String listenerImpl : ( (String) entry.getValue() ).split( " ," ) ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/package-info.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/package-info.java
index 7ee8032e7b..3bc9a13f50 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/package-info.java
@@ -9,4 +9,3 @@
  * Internal details of implementing support for JPA callbacks
  */
 package org.hibernate.jpa.event.internal;
-
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/package-info.java
index fd22591a5b..fd269b18f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/package-info.java
@@ -9,4 +9,3 @@
  * The SPI contracts for supporting JPA lifecycle callbacks.
  */
 package org.hibernate.jpa.event.spi;
-