some minor code cleanup after testing