diff --git a/src/main/java/bdv/AbstractCachedViewerSetupImgLoader.java b/src/main/java/bdv/AbstractCachedViewerSetupImgLoader.java
index 177d4ddb874d89ff1515978bb4237ffd7d54be67..4858bf872f429b9da1b6e504ab840edf0a0e11ff 100644
--- a/src/main/java/bdv/AbstractCachedViewerSetupImgLoader.java
+++ b/src/main/java/bdv/AbstractCachedViewerSetupImgLoader.java
@@ -44,7 +44,7 @@ import net.imglib2.type.NativeType;
 /**
  * Abstract {@link ViewerSetupImgLoader} with a VolatileGlobalCellCache.
  *
- * @author Stephan Saalfeld <saalfelds@janelia.hhmi.org>
+ * @author Stephan Saalfeld
  */
 abstract public class AbstractCachedViewerSetupImgLoader< T extends NativeType< T > , V extends Volatile< T > & NativeType< V >, A extends VolatileAccess >
 	extends AbstractViewerSetupImgLoader< T, V >
diff --git a/src/main/java/bdv/export/WriteSequenceToHdf5.java b/src/main/java/bdv/export/WriteSequenceToHdf5.java
index 845e7823dc7137f6c147334c65b29c5c025d26a4..a2294dfe97274bcf97ead885c67221c5fccdfbc4 100644
--- a/src/main/java/bdv/export/WriteSequenceToHdf5.java
+++ b/src/main/java/bdv/export/WriteSequenceToHdf5.java
@@ -91,7 +91,7 @@ import net.imglib2.util.Intervals;
  * A data-set can be stored in a single hdf5 file or split across several hdf5
  * "partitions" with one master hdf5 linking into the partitions.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class WriteSequenceToHdf5
 {
diff --git a/src/main/java/bdv/img/hdf5/DimsAndExistence.java b/src/main/java/bdv/img/hdf5/DimsAndExistence.java
index 5890a563eb43556193af46f2e10e4f29a05067bd..7939223367408e04aef0192e0794deb4c6a64240 100644
--- a/src/main/java/bdv/img/hdf5/DimsAndExistence.java
+++ b/src/main/java/bdv/img/hdf5/DimsAndExistence.java
@@ -32,7 +32,7 @@ package bdv.img.hdf5;
  * The dimensions of an image and a flag indicating whether that image
  * exists (can be loaded)
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class DimsAndExistence
 {
diff --git a/src/main/java/bdv/img/hdf5/HDF5AccessHack.java b/src/main/java/bdv/img/hdf5/HDF5AccessHack.java
index f30f9665afa296be743c23da142dfec074f44fdd..8d437950cbd9b325fa326e6dceea85cdab4d2994 100644
--- a/src/main/java/bdv/img/hdf5/HDF5AccessHack.java
+++ b/src/main/java/bdv/img/hdf5/HDF5AccessHack.java
@@ -57,7 +57,7 @@ import ch.systemsx.cisd.hdf5.IHDF5Reader;
  * The HDF5 fileId is extracted from a jhdf5 HDF5Reader using reflection to
  * avoid having to do everything ourselves.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 class HDF5AccessHack implements IHDF5Access
 {
diff --git a/src/main/java/bdv/img/hdf5/Partition.java b/src/main/java/bdv/img/hdf5/Partition.java
index ce8edf17d02a57b0a7ac9801c639fb2d187f5838..2c7e0716d5e849245b5d5ea2ef9ef7e4e9e461fb 100644
--- a/src/main/java/bdv/img/hdf5/Partition.java
+++ b/src/main/java/bdv/img/hdf5/Partition.java
@@ -44,7 +44,7 @@ import mpicbg.spim.data.sequence.ViewId;
  * created using the Partition information (without looking at the constituent
  * files).
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class Partition
 {
diff --git a/src/main/java/bdv/img/openconnectome/OpenConnectomeDataset.java b/src/main/java/bdv/img/openconnectome/OpenConnectomeDataset.java
index 07e7d8f08dffb48629af30ce0dd48ee96586e8e5..a4b7f95109b6e8187717d4ef4772ca6c71fbd327 100644
--- a/src/main/java/bdv/img/openconnectome/OpenConnectomeDataset.java
+++ b/src/main/java/bdv/img/openconnectome/OpenConnectomeDataset.java
@@ -37,7 +37,7 @@ import java.util.HashMap;
  *
  * <a href="http://openconnecto.me/ocp/ca/bock11/info/">http://openconnecto.me/ocp/ca/bock11/info/</a>
  *
- * @author Stephan Saalfeld &lt;saalfelds@janelia.hhmi.org&gt;
+ * @author Stephan Saalfeld
  */
 public class OpenConnectomeDataset implements Serializable
 {
diff --git a/src/main/java/bdv/img/openconnectome/OpenConnectomeProject.java b/src/main/java/bdv/img/openconnectome/OpenConnectomeProject.java
index a1efe118092dcf51118019b7a589bed545c31858..ab77eae8e9cccf428969e1d33db7f423c02449dc 100644
--- a/src/main/java/bdv/img/openconnectome/OpenConnectomeProject.java
+++ b/src/main/java/bdv/img/openconnectome/OpenConnectomeProject.java
@@ -35,7 +35,7 @@ import java.io.Serializable;
  *
  * {@linkplain }
  *
- * @author Stephan Saalfeld &lt;saalfelds@janelia.hhmi.org&gt;
+ * @author Stephan Saalfeld
  */
 public class OpenConnectomeProject implements Serializable
 {
diff --git a/src/main/java/bdv/spimdata/tools/MergeExample.java b/src/main/java/bdv/spimdata/tools/MergeExample.java
index b2250b681ea3d3208b011da806db56d01a4f5bfa..96d8d713606de59ea0ea5635313c4443fc6b1bbb 100644
--- a/src/main/java/bdv/spimdata/tools/MergeExample.java
+++ b/src/main/java/bdv/spimdata/tools/MergeExample.java
@@ -54,7 +54,7 @@ import mpicbg.spim.data.sequence.TimePoints;
 import mpicbg.spim.data.sequence.ViewId;
 
 /**
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class MergeExample
 {
diff --git a/src/main/java/bdv/tools/bookmarks/BookmarkTextOverlayAnimator.java b/src/main/java/bdv/tools/bookmarks/BookmarkTextOverlayAnimator.java
index fa2cf99c47c8b0b5ab2178d12b4d8a0e41d5decf..539290a733ac0536ad87b7303dc15899c6875123 100644
--- a/src/main/java/bdv/tools/bookmarks/BookmarkTextOverlayAnimator.java
+++ b/src/main/java/bdv/tools/bookmarks/BookmarkTextOverlayAnimator.java
@@ -43,7 +43,7 @@ import bdv.viewer.animate.OverlayAnimator;
  * Draw one line of text in the center or bottom right of the display. Text is
  * fading in and out.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class BookmarkTextOverlayAnimator implements OverlayAnimator
 {
diff --git a/src/main/java/bdv/tools/brightness/BrightnessDialog.java b/src/main/java/bdv/tools/brightness/BrightnessDialog.java
index ce98337f48a7fe79259fc397cb4b68e5892fb93e..906694afeaff3fe09901b30ef20d60a980abadf1 100644
--- a/src/main/java/bdv/tools/brightness/BrightnessDialog.java
+++ b/src/main/java/bdv/tools/brightness/BrightnessDialog.java
@@ -72,7 +72,7 @@ import net.imglib2.type.numeric.ARGBType;
 /**
  * Adjust brightness and colors for individual (or groups of) {@link BasicViewSetup setups}.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 @Deprecated
 public class BrightnessDialog extends DelayedPackDialog
diff --git a/src/main/java/bdv/tools/brightness/MinMaxGroup.java b/src/main/java/bdv/tools/brightness/MinMaxGroup.java
index 1c1bcf34f857f9f63d9177937f0cc979bca2a440..de3ce938bcef80be980c049ca50eca8ad1017596 100644
--- a/src/main/java/bdv/tools/brightness/MinMaxGroup.java
+++ b/src/main/java/bdv/tools/brightness/MinMaxGroup.java
@@ -49,7 +49,7 @@ import bdv.util.BoundedValueDouble;
  * An {@link UpdateListener} (usually a GUI component) can be notified about
  * changes.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class MinMaxGroup extends BoundedIntervalDouble
 {
diff --git a/src/main/java/bdv/tools/brightness/SetupAssignments.java b/src/main/java/bdv/tools/brightness/SetupAssignments.java
index 15e13bf3905f770d64253e51d8e73fd7f039c272..6e343899b210bcfd58540b622b84f6d5e462063f 100644
--- a/src/main/java/bdv/tools/brightness/SetupAssignments.java
+++ b/src/main/java/bdv/tools/brightness/SetupAssignments.java
@@ -49,7 +49,7 @@ import mpicbg.spim.data.XmlHelpers;
  * <li>No group is empty.</li>
  * </ol>
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 @Deprecated
 public class SetupAssignments
diff --git a/src/main/java/bdv/tools/crop/CropImgLoader.java b/src/main/java/bdv/tools/crop/CropImgLoader.java
index 00ee8a5e2d68e630f15d1cdeb3f162a575ce5f88..afa3d502821788bbda3cd8f8781661669a9ba82b 100644
--- a/src/main/java/bdv/tools/crop/CropImgLoader.java
+++ b/src/main/java/bdv/tools/crop/CropImgLoader.java
@@ -56,7 +56,7 @@ import bdv.viewer.Source;
  * This {@link ImgLoader} provides views and transformations into a cropped
  * region of a data-set (provided by list of {@link Source Sources}).
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class CropImgLoader implements BasicImgLoader
 {
diff --git a/src/main/java/bdv/util/Affine3DHelpers.java b/src/main/java/bdv/util/Affine3DHelpers.java
index 0a7c7c8f55212e90bcd2c79930b7337a791f52e9..d0aca79f3d40102c2e7f1fac33778e57432c8f1b 100644
--- a/src/main/java/bdv/util/Affine3DHelpers.java
+++ b/src/main/java/bdv/util/Affine3DHelpers.java
@@ -36,7 +36,7 @@ import net.imglib2.util.LinAlgHelpers;
  * {@link AffineTransform3D}. Note that most of these helpers assume additional
  * restrictions on the affine transform.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class Affine3DHelpers
 {
diff --git a/src/main/java/bdv/util/BoundedInterval.java b/src/main/java/bdv/util/BoundedInterval.java
index d367ec5333c3b8cd29b26bfe7b184a76a2961847..63c728aa7da996f916af4cb14141d3f871116824 100644
--- a/src/main/java/bdv/util/BoundedInterval.java
+++ b/src/main/java/bdv/util/BoundedInterval.java
@@ -35,7 +35,7 @@ package bdv.util;
  * {@link BoundedValue#setUpdateListener(UpdateListener) minimum and maximum}
  * values and/or overriding the {@link #updateInterval(int, int)} method.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class BoundedInterval
 {
diff --git a/src/main/java/bdv/util/BoundedIntervalDouble.java b/src/main/java/bdv/util/BoundedIntervalDouble.java
index 0770566182fcd077fd94e9341cfeedf8571848d9..1257c1cfc21764225a7e5728ca13cc2e173d618e 100644
--- a/src/main/java/bdv/util/BoundedIntervalDouble.java
+++ b/src/main/java/bdv/util/BoundedIntervalDouble.java
@@ -35,7 +35,7 @@ package bdv.util;
  * {@link BoundedValueDouble#setUpdateListener(UpdateListener) minimum and maximum}
  * values and/or overriding the {@link #updateInterval(double, double)} method.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class BoundedIntervalDouble
 {
diff --git a/src/main/java/bdv/util/BoundedValue.java b/src/main/java/bdv/util/BoundedValue.java
index 0e9c1232053ff3f7d075010cebaa0e0b0ac5550e..5ef692507f13517d940f95f35c8bd42be782e564 100644
--- a/src/main/java/bdv/util/BoundedValue.java
+++ b/src/main/java/bdv/util/BoundedValue.java
@@ -33,7 +33,7 @@ package bdv.util;
  * {@link #setUpdateListener(UpdateListener) listener} is notified when the
  * value or its allowed range is changed.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class BoundedValue
 {
diff --git a/src/main/java/bdv/util/BoundedValueDouble.java b/src/main/java/bdv/util/BoundedValueDouble.java
index 3561a014bb0d828d27c4a1487cece84c0dd16abb..369072ab93ae74d94929e313bc679b485272c42f 100644
--- a/src/main/java/bdv/util/BoundedValueDouble.java
+++ b/src/main/java/bdv/util/BoundedValueDouble.java
@@ -33,7 +33,7 @@ package bdv.util;
  * {@link #setUpdateListener(UpdateListener) listener} is notified when the
  * value or its allowed range is changed.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class BoundedValueDouble
 {
diff --git a/src/main/java/bdv/util/RealRandomAccessibleSource.java b/src/main/java/bdv/util/RealRandomAccessibleSource.java
index 7c337ee3a23a72618f9de9fc4b2d163fa339b430..0fef59da4c0c8702baaffcf3d90c46cebce5446d 100644
--- a/src/main/java/bdv/util/RealRandomAccessibleSource.java
+++ b/src/main/java/bdv/util/RealRandomAccessibleSource.java
@@ -45,7 +45,7 @@ import net.imglib2.view.Views;
  *
  * @param <T>
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public abstract class RealRandomAccessibleSource< T extends Type< T > > implements Source< T >
 {
diff --git a/src/main/java/bdv/viewer/Source.java b/src/main/java/bdv/viewer/Source.java
index 68e2e1c5d726b57e902098b47ab0fa015f94c720..434ec35fc3bd430d22e8e0cff878ff865521d66c 100644
--- a/src/main/java/bdv/viewer/Source.java
+++ b/src/main/java/bdv/viewer/Source.java
@@ -44,7 +44,7 @@ import net.imglib2.realtransform.AffineTransform3D;
  * {@link TimePoint#getId() id}. This timepoint index is an index into the
  * ordered list of timepoints {@link TimePoints#getTimePointsOrdered()}.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public interface Source< T >
 {
diff --git a/src/main/java/bdv/viewer/ViewerFrame.java b/src/main/java/bdv/viewer/ViewerFrame.java
index 7a282c6e16f14a5c0fd5fe62ee1a81ecba8476ed..b6d273da6615fd2e10e41899e3b15fbfa349075c 100644
--- a/src/main/java/bdv/viewer/ViewerFrame.java
+++ b/src/main/java/bdv/viewer/ViewerFrame.java
@@ -54,7 +54,7 @@ import bdv.util.AWTUtils;
  * A {@link JFrame} containing a {@link ViewerPanel} and associated
  * {@link InputActionBindings}.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class ViewerFrame extends JFrame
 {
diff --git a/src/main/java/bdv/viewer/ViewerOptions.java b/src/main/java/bdv/viewer/ViewerOptions.java
index 57d4959cd75e4be38d885e12ceaccacd4c84a2bb..b977c4585e8fdfadafe7b32ffc2efb6bb0a283f4 100644
--- a/src/main/java/bdv/viewer/ViewerOptions.java
+++ b/src/main/java/bdv/viewer/ViewerOptions.java
@@ -46,7 +46,7 @@ import bdv.TransformEventHandlerFactory;
 /**
  * Optional parameters for {@link ViewerPanel}.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class ViewerOptions
 {
diff --git a/src/main/java/bdv/viewer/VisibilityAndGrouping.java b/src/main/java/bdv/viewer/VisibilityAndGrouping.java
index 2c2662a7376cc4a7db3697d803cc99c785e8286d..894f2b9beeda4011a9fef2470b3c78e3fbfbb5e4 100644
--- a/src/main/java/bdv/viewer/VisibilityAndGrouping.java
+++ b/src/main/java/bdv/viewer/VisibilityAndGrouping.java
@@ -46,7 +46,7 @@ import static bdv.viewer.DisplayMode.SINGLE;
  * Manage visibility and currentness of sources and groups, as well as grouping
  * of sources, and display mode.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 @Deprecated
 public class VisibilityAndGrouping
diff --git a/src/main/java/bdv/viewer/animate/AbstractAnimator.java b/src/main/java/bdv/viewer/animate/AbstractAnimator.java
index f2e69265cf17e7579ceab2241a101dab4d5fd88b..1b24cb2e34e160c6e6432b51f9d55e4301166bab 100644
--- a/src/main/java/bdv/viewer/animate/AbstractAnimator.java
+++ b/src/main/java/bdv/viewer/animate/AbstractAnimator.java
@@ -37,8 +37,8 @@ import bdv.viewer.ViewerFrame;
  * from {@link System#currentTimeMillis()} or a frame number when rendering
  * movies.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
- * @author Jean-Yves Tinevez &lt;jeanyves.tinevez@gmail.com&gt;
+ * @author Tobias Pietzsch
+ * @author Jean-Yves Tinevez
  */
 public class AbstractAnimator
 {
diff --git a/src/main/java/bdv/viewer/animate/AbstractTransformAnimator.java b/src/main/java/bdv/viewer/animate/AbstractTransformAnimator.java
index daff90e61eadd3cbd89c5f0be012a5b00d6061fa..d72adc7594e8c045efa6baf08f701b9c40ca8cb6 100644
--- a/src/main/java/bdv/viewer/animate/AbstractTransformAnimator.java
+++ b/src/main/java/bdv/viewer/animate/AbstractTransformAnimator.java
@@ -38,8 +38,8 @@ import bdv.viewer.ViewerFrame;
  * example you can use <b>ms</b> obtained from
  * {@link System#currentTimeMillis()} or a frame number when rendering movies.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
- * @author Jean-Yves Tinevez &lt;jeanyves.tinevez@gmail.com&gt;
+ * @author Tobias Pietzsch
+ * @author Jean-Yves Tinevez
  */
 public abstract class AbstractTransformAnimator extends AbstractAnimator
 {
diff --git a/src/main/java/bdv/viewer/animate/MessageOverlayAnimator.java b/src/main/java/bdv/viewer/animate/MessageOverlayAnimator.java
index abad56decd0efdccc4f0c85cb805baebf01daa17..12338cd6cd746cb0ed449505eddb265a435c8555 100644
--- a/src/main/java/bdv/viewer/animate/MessageOverlayAnimator.java
+++ b/src/main/java/bdv/viewer/animate/MessageOverlayAnimator.java
@@ -43,7 +43,7 @@ import java.util.List;
  * fading in a specified time. If several messages are drawn at the same time,
  * old messages scroll up.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class MessageOverlayAnimator implements OverlayAnimator
 {
diff --git a/src/main/java/bdv/viewer/animate/TextOverlayAnimator.java b/src/main/java/bdv/viewer/animate/TextOverlayAnimator.java
index fb715d3a89e54d73e0f5483200b90869295f186a..71b20ba3f290f5aa8dc1bf0d1d0c71495aea3c42 100644
--- a/src/main/java/bdv/viewer/animate/TextOverlayAnimator.java
+++ b/src/main/java/bdv/viewer/animate/TextOverlayAnimator.java
@@ -39,7 +39,7 @@ import java.awt.geom.Rectangle2D;
  * Draw one line of text in the center or bottom right of the display. Text is
  * fading in and out.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class TextOverlayAnimator extends AbstractAnimator implements OverlayAnimator
 {
diff --git a/src/main/java/bdv/viewer/animate/TranslationAnimator.java b/src/main/java/bdv/viewer/animate/TranslationAnimator.java
index a044af6c25c9ea0d27b3e68e53957af96e1d536e..d232946eebef22e2a888dd77f246d4bddf662430 100644
--- a/src/main/java/bdv/viewer/animate/TranslationAnimator.java
+++ b/src/main/java/bdv/viewer/animate/TranslationAnimator.java
@@ -34,7 +34,7 @@ import net.imglib2.realtransform.AffineTransform3D;
  * An animator that just executes a constant speed translation of the current
  * viewpoint to a target location, keeping all other view parameters constant.
  *
- * @author Jean-Yves Tinevez &lt;jeanyves.tinevez@gmail.com&gt;
+ * @author Jean-Yves Tinevez
  */
 public class TranslationAnimator extends AbstractTransformAnimator
 {
diff --git a/src/main/java/bdv/viewer/overlay/MultiBoxOverlay.java b/src/main/java/bdv/viewer/overlay/MultiBoxOverlay.java
index fdc65d5bf9d6537d6f97cfbb253c202876488f50..6715b1f7f3c245a46de10648d64f453d7bde951d 100644
--- a/src/main/java/bdv/viewer/overlay/MultiBoxOverlay.java
+++ b/src/main/java/bdv/viewer/overlay/MultiBoxOverlay.java
@@ -52,7 +52,7 @@ import net.imglib2.util.LinAlgHelpers;
  * colors depending whether the sources are visible.
  *
  * @author Stephan Saalfeld
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class MultiBoxOverlay
 {
diff --git a/src/main/java/bdv/viewer/overlay/RenderBoxHelper.java b/src/main/java/bdv/viewer/overlay/RenderBoxHelper.java
index a29b445e69e8da31d85e804be565d2adfe7f6fdd..4c24b7d540ca57ee66865b171558e341db2e1bb3 100644
--- a/src/main/java/bdv/viewer/overlay/RenderBoxHelper.java
+++ b/src/main/java/bdv/viewer/overlay/RenderBoxHelper.java
@@ -37,7 +37,7 @@ import net.imglib2.realtransform.AffineTransform3D;
  * Helper for rendering overlay boxes.
  *
  * @author Stephan Saalfeld
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class RenderBoxHelper
 {
diff --git a/src/main/java/bdv/viewer/overlay/SourceInfoOverlayRenderer.java b/src/main/java/bdv/viewer/overlay/SourceInfoOverlayRenderer.java
index 717532d246dfc44e16eded4b61660a9c2804f990..cf6b7d598dccb71e6289805058f1c4c274102a34 100644
--- a/src/main/java/bdv/viewer/overlay/SourceInfoOverlayRenderer.java
+++ b/src/main/java/bdv/viewer/overlay/SourceInfoOverlayRenderer.java
@@ -40,7 +40,7 @@ import mpicbg.spim.data.sequence.TimePoint;
  * Render current source name and current timepoint of a {@link ViewerState}
  * into a {@link Graphics2D}.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class SourceInfoOverlayRenderer
 {
diff --git a/src/main/java/bdv/viewer/render/DefaultMipmapOrdering.java b/src/main/java/bdv/viewer/render/DefaultMipmapOrdering.java
index 683bc16f1e6c51fbb6b129f7fd4f838114cf782b..332bc1cdf392509ec71b6bbf18b96b18a227bf40 100644
--- a/src/main/java/bdv/viewer/render/DefaultMipmapOrdering.java
+++ b/src/main/java/bdv/viewer/render/DefaultMipmapOrdering.java
@@ -53,7 +53,7 @@ import net.imglib2.realtransform.AffineTransform3D;
  * between images that have all data present already or that we move to a new
  * image with no data present at all.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 public class DefaultMipmapOrdering implements MipmapOrdering
 {
diff --git a/src/main/java/bdv/viewer/state/SourceGroup.java b/src/main/java/bdv/viewer/state/SourceGroup.java
index c4a14584e9727f0290797f93eabcf3b16b81fecc..3d1d19baeec0f6c66a1ac8770b7566d3594dfcda 100644
--- a/src/main/java/bdv/viewer/state/SourceGroup.java
+++ b/src/main/java/bdv/viewer/state/SourceGroup.java
@@ -38,7 +38,7 @@ import bdv.viewer.DisplayMode;
 /**
  * TODO
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 @Deprecated
 public class SourceGroup
diff --git a/src/main/java/bdv/viewer/state/ViewerState.java b/src/main/java/bdv/viewer/state/ViewerState.java
index 39ae42d00c5ffb991cf9400dd84efa5b0259fe53..75ac5fdc325883327f91a1a396f796e3068f3a30 100644
--- a/src/main/java/bdv/viewer/state/ViewerState.java
+++ b/src/main/java/bdv/viewer/state/ViewerState.java
@@ -51,7 +51,7 @@ import static bdv.viewer.Interpolation.NEARESTNEIGHBOR;
  * current timepoint, the visible and current sources and groups respectively,
  * the viewer transformation, etc.
  *
- * @author Tobias Pietzsch &lt;tobias.pietzsch@gmail.com&gt;
+ * @author Tobias Pietzsch
  */
 @Deprecated
 public class ViewerState