continuing cleanup of code