minor cleanup to prepare for more functions to call