formatting and cleanup related to #71