clean up formatting here, use {} for method def and if/else