clean up the code

Signed-off-by: Sébastien Boisvert <boisvert@anl.gov>