some clenaup work