diff --git a/src/main/java/mil/dds/anet/beans/Report.java b/src/main/java/mil/dds/anet/beans/Report.java
index b65f0635bb..486389a5e9 100644
--- a/src/main/java/mil/dds/anet/beans/Report.java
+++ b/src/main/java/mil/dds/anet/beans/Report.java
@@ -111,7 +111,8 @@ public void setEngagementDate(DateTime engagementDate) {
 
 	/**
 	 * Returns an Integer value from the set (1,2,3,4,5,6,7) in accordance with
-	 * week days [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+	 * week days [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday].
+	 *
 	 * @return Integer engagement day of week
 	 */
 	public Integer getEngagementDayOfWeek() {
diff --git a/src/main/java/mil/dds/anet/database/OrganizationDao.java b/src/main/java/mil/dds/anet/database/OrganizationDao.java
index c81ba8294e..8a1ba06ff8 100644
--- a/src/main/java/mil/dds/anet/database/OrganizationDao.java
+++ b/src/main/java/mil/dds/anet/database/OrganizationDao.java
@@ -71,15 +71,15 @@ public List<Organization> getTopLevelOrgs(OrganizationType type) {
 	@UseStringTemplate3StatementLocator
 	public interface OrgListQueries {
 		@Mapper(OrganizationMapper.class)
-		@SqlQuery("SELECT id AS organizations_id" +
-				", shortName AS organizations_shortName" +
-				", longName AS organizations_longName" +
-				", identificationCode AS organizations_identificationCode" +
-				", type AS organizations_type" +
-				", parentOrgId AS organizations_parentOrgId" +
-				", createdAt AS organizations_createdAt" +
-				", updatedAt AS organizations_updatedAt" +
-				" FROM organizations WHERE shortName IN ( <shortNames> )")
+		@SqlQuery("SELECT id AS organizations_id"
+				+ ", shortName AS organizations_shortName"
+				+ ", longName AS organizations_longName"
+				+ ", identificationCode AS organizations_identificationCode"
+				+ ", type AS organizations_type"
+				+ ", parentOrgId AS organizations_parentOrgId"
+				+ ", createdAt AS organizations_createdAt"
+				+ ", updatedAt AS organizations_updatedAt"
+				+ " FROM organizations WHERE shortName IN ( <shortNames> )")
 		public List<Organization> getOrgsByShortNames(@BindIn("shortNames") List<String> shortNames);
 	}
 
diff --git a/src/main/java/mil/dds/anet/database/ReportSensitiveInformationDao.java b/src/main/java/mil/dds/anet/database/ReportSensitiveInformationDao.java
index 89897f1c8d..4d78e8b845 100644
--- a/src/main/java/mil/dds/anet/database/ReportSensitiveInformationDao.java
+++ b/src/main/java/mil/dds/anet/database/ReportSensitiveInformationDao.java
@@ -110,8 +110,7 @@ public ReportSensitiveInformation getForReport(Report report, Person user) {
 		ReportSensitiveInformation rsi = (results.size() == 0) ? null : results.get(0);
 		if (rsi != null) {
 			AnetAuditLogger.log("ReportSensitiveInformation {} retrieved by {} ", rsi, user);
-		}
-		else {
+		} else {
 			rsi = new ReportSensitiveInformation();
 			rsi.setReportId(report.getId());
 		}
@@ -120,8 +119,8 @@ public ReportSensitiveInformation getForReport(Report report, Person user) {
 
 	/**
 	 * A user is allowed to access a report's sensitive information if either of the following holds true:
-	 * • the user is the author of the report
-	 * • the user holds an authorized position in the advisorOrg of the report
+	 * • the user is the author of the report;
+	 * • the user holds an authorized position in the advisorOrg of the report.
 	 *
 	 * @param user the user executing the request
 	 * @param report the report
diff --git a/src/main/java/mil/dds/anet/resources/GraphQLResource.java b/src/main/java/mil/dds/anet/resources/GraphQLResource.java
index f14106d703..258f06682a 100644
--- a/src/main/java/mil/dds/anet/resources/GraphQLResource.java
+++ b/src/main/java/mil/dds/anet/resources/GraphQLResource.java
@@ -338,11 +338,10 @@ private void locateData(final XSSFWorkbook workbook, final String name, final Ma
 	}
 
 	/**
-	 * TODO: This should end up in a converter type class, perhaps lookup by annotations.
-	 * 
 	 * Create the sheet with the supplied name in the supplied workbook using the
 	 * supplied data.
-	 * 
+	 * TODO: This should end up in a converter type class, perhaps lookup by annotations.
+	 *
 	 * @param workbook
 	 *            the workbook
 	 * @param name
diff --git a/src/main/java/mil/dds/anet/resources/OrganizationResource.java b/src/main/java/mil/dds/anet/resources/OrganizationResource.java
index 7e21d4fc20..1539081327 100644
--- a/src/main/java/mil/dds/anet/resources/OrganizationResource.java
+++ b/src/main/java/mil/dds/anet/resources/OrganizationResource.java
@@ -96,8 +96,7 @@ public Organization createNewOrganization(Organization org, @Auth Person user) {
 		final Organization created;
 		try {
 			created = dao.insert(org);
-		}
-		catch (UnableToExecuteStatementException e) {
+		} catch (UnableToExecuteStatementException e) {
 			throw handleSqlException(e);
 		}
 		
@@ -145,8 +144,7 @@ public Response updateOrganization(Organization org, @Auth Person user) {
 		final int numRows;
 		try {
 			numRows = dao.update(org);
-		}
-		catch (UnableToExecuteStatementException e) {
+		} catch (UnableToExecuteStatementException e) {
 			throw handleSqlException(e);
 		}
 
diff --git a/src/main/java/mil/dds/anet/resources/PositionResource.java b/src/main/java/mil/dds/anet/resources/PositionResource.java
index a422905b1a..0752d8acc0 100644
--- a/src/main/java/mil/dds/anet/resources/PositionResource.java
+++ b/src/main/java/mil/dds/anet/resources/PositionResource.java
@@ -178,8 +178,7 @@ public Response updatePosition(@Auth Person user, Position pos) {
 
 		if (origPos.getAuthorized() != pos.getAuthorized()) {
 			AnetAuditLogger.log("Position {} edited by {}; authorized changed from {} to {}", pos, user, origPos.getAuthorized(), pos.getAuthorized());
-		}
-		else {
+		} else {
 			AnetAuditLogger.log("Position {} edited by {}", pos, user);
 		}
 		return (numRows == 1) ? Response.ok().build() : Response.status(Status.NOT_FOUND).build();
diff --git a/src/main/java/mil/dds/anet/resources/ReportResource.java b/src/main/java/mil/dds/anet/resources/ReportResource.java
index 4e09046487..c0c16fb63c 100644
--- a/src/main/java/mil/dds/anet/resources/ReportResource.java
+++ b/src/main/java/mil/dds/anet/resources/ReportResource.java
@@ -769,16 +769,16 @@ public List<Map<String, Object>> getAdvisorReportInsights(
 	}
 
 	private Map<Integer, Organization> getOrgsByShortNames(List<String> orgShortNames) {
-			final Map<Integer, Organization> result = new HashMap<>();
-			for (final Organization organization : engine.getOrganizationDao().getOrgsByShortNames(orgShortNames)) {
-				result.put(organization.getId(), organization);
-			}
-			return result;
+		final Map<Integer, Organization> result = new HashMap<>();
+		for (final Organization organization : engine.getOrganizationDao().getOrgsByShortNames(orgShortNames)) {
+			result.put(organization.getId(), organization);
 		}
+		return result;
+	}
+
 	/**
 	 * The comparator to be used when ordering the roll up graph results to ensure
 	 * that any pinned organisation names are returned at the start of the list.
-	 *
 	 */
 	public static class RollupGraphComparator implements Comparator<RollupGraph> {