#976
Clean up code after review with Ed