cleanup & minor changes