cleaning up various details