Clean up code

Authored by mlaurent on Oct 20 2019, 2:52 PM.