~minor code adjustments